diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-02-18 21:32:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-18 21:32:10 +0000 |
| commit | 3868a4a974f0d63f7440d2f27d92e4284979afb6 (patch) | |
| tree | c3d6020eda4610d76e5500cb677d9ae8f48f0b54 | |
| parent | aac29b49662558f55d737fe2bb7f5060eddd1092 (diff) | |
| parent | ebddd94caf89f92be5908d71325651864575414f (diff) | |
Merge "Fix end-call FAB position when dial pad is shown on device rotate." into nyc-dev
am: ebddd94caf
* commit 'ebddd94caf89f92be5908d71325651864575414f':
Fix end-call FAB position when dial pad is shown on device rotate.
| -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) { |