diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 214f3206e..aefe01f7a 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -110,7 +110,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O ActionBarController.ActivityUi { private static final String TAG = "DialtactsActivity"; - public static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + public static final boolean DEBUG = false; public static final String SHARED_PREFS_NAME = "com.android.dialer_preferences"; @@ -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 */ |