diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-02-18 21:17:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-18 21:17:50 +0000 |
| commit | ebddd94caf89f92be5908d71325651864575414f (patch) | |
| tree | 6d679266cec351353c35597092ad14e4cdb296ce /InCallUI | |
| parent | d1f0d576021248cc8aac4cd9845f01c572874f0b (diff) | |
| parent | b9663702fefd8131db84b7adb7bd037f4a92b0ba (diff) | |
Merge "Fix end-call FAB position when dial pad is shown on device rotate." into nyc-dev
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) { |