diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-02-18 21:39:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-18 21:39:09 +0000 |
| commit | c9755cd2be5179d1b5af2a85378c13c3010fdd67 (patch) | |
| tree | 96a353dd6d25cabb539f48480a477f912a1a0d26 /InCallUI | |
| parent | 1836aae2fcb25f7e4073b00d0d0ed38955bdfafc (diff) | |
| parent | 3868a4a974f0d63f7440d2f27d92e4284979afb6 (diff) | |
Merge "Fix end-call FAB position when dial pad is shown on device rotate." into nyc-dev am: ebddd94caf
am: 3868a4a974
* commit '3868a4a974f0d63f7440d2f27d92e4284979afb6':
Fix end-call FAB position when dial pad is shown on device rotate.
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index dff27476c..73155a460 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -780,9 +780,11 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD showFragment(TAG_DIALPAD_FRAGMENT, true, true); mDialpadFragment.animateShowDialpad(); } - mCallCardFragment.onDialpadVisibilityChange(show); mDialpadFragment.getView().startAnimation(show ? mSlideIn : mSlideOut); } + // Note: onDialpadVisibilityChange is called here to ensure that the dialpad FAB + // repositions itself. + mCallCardFragment.onDialpadVisibilityChange(show); final ProximitySensor sensor = InCallPresenter.getInstance().getProximitySensor(); if (sensor != null) { |