diff options
| author | Nancy Chen <nancychen@google.com> | 2016-02-11 17:52:33 -0800 |
|---|---|---|
| committer | Nancy Chen <nancychen@google.com> | 2016-02-12 13:38:07 -0800 |
| commit | 82c771798060de0be025c7c6c669cb4ccbd18997 (patch) | |
| tree | 5823343e25c05deedce574c4cb7a262dd1a5f8d2 /InCallUI/src | |
| parent | bace43b404bb207ca6cec066cdea752f41bca6c3 (diff) | |
Make secondary info visible for multi-window InCallUI.
Secondary info was previously hidden after the layout refactoring to
support resizing in multi-window mode. Make it visible and also keep it
at the bottom of the screen because the vertical screen real estate is
limited.
Bug: 26253432
Change-Id: I8e7f3b462784c7af62ccdb95e637595f7d382edd
Diffstat (limited to 'InCallUI/src')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 1a9f283b1..ad7269059 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -115,6 +115,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr private int mFabNormalDiameter; private int mFabSmallDiameter; private boolean mIsLandscape; + private boolean mHasLargePhoto; private boolean mIsDialpadShowing; // Primary caller info @@ -1333,7 +1334,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr int offsetY = 0; if (!mIsDialpadShowing) { offsetY = mFloatingActionButtonVerticalOffset; - if (mSecondaryCallInfo.isShown()) { + if (mSecondaryCallInfo.isShown() && mHasLargePhoto) { offsetY -= mSecondaryCallInfo.getHeight(); } } @@ -1363,6 +1364,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr } mIsLandscape = getResources().getBoolean(R.bool.is_layout_landscape); + mHasLargePhoto = getResources().getBoolean(R.bool.has_large_photo); final ViewGroup parent = ((ViewGroup) mPrimaryCallCardContainer.getParent()); final ViewTreeObserver observer = parent.getViewTreeObserver(); |