diff options
author | Yorke Lee <yorkelee@google.com> | 2015-06-02 16:55:49 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-02 16:55:49 +0000 |
commit | 2b36667435ab8b8346b65d62fad38461406ed50d (patch) | |
tree | 1a6d971ce37ca0aa10013ce77ba5e80a9741f7e3 /src | |
parent | 44ca2bdc214de9203518416d6ce3756a7ba8f796 (diff) | |
parent | 81a313dfd824a4aafe86e636c537a08bae0c1e0b (diff) |
Merge "Enter search UI even if dialpad is not animating" into mnc-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index f22c3f56f..aefe01f7a 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -166,9 +166,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O AnimationListenerAdapter mSlideInListener = new AnimationListenerAdapter() { @Override public void onAnimationEnd(Animation animation) { - if (!isInSearchUi()) { - enterSearchUi(true /* isSmartDial */, mSearchQuery, false); - } + maybeEnterSearchUi(); } }; @@ -703,6 +701,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mFloatingActionButtonController.scaleOut(); } else { mFloatingActionButtonController.setVisible(false); + maybeEnterSearchUi(); } mActionBarController.onDialpadUp(); @@ -1038,6 +1037,12 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O } } + private void maybeEnterSearchUi() { + if (!isInSearchUi()) { + enterSearchUi(true /* isSmartDial */, mSearchQuery, false); + } + } + /** * @return True if the search UI was exited, false otherwise */ |