diff options
| author | calderwoodra <calderwoodra@google.com> | 2018-04-06 12:29:17 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-04-06 16:34:44 -0700 |
| commit | 23ef36ff6dfd2fdb47f6ec8bb6928e4e40e11fa5 (patch) | |
| tree | e2282cf5fadeaf528ed65a4f7cdf91c4276b6fd5 /java/com/android/dialer/main/impl/MainSearchController.java | |
| parent | 1ab138ae73314be6a54ee8d3aed18548f80be05e (diff) | |
Only request focus on search edit text when it's slide down.
Bug: 77586391
Test: manual
PiperOrigin-RevId: 191924178
Change-Id: I792a6f0308f0dde9b4ae82227aa6a8327208a192
Diffstat (limited to 'java/com/android/dialer/main/impl/MainSearchController.java')
| -rw-r--r-- | java/com/android/dialer/main/impl/MainSearchController.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/java/com/android/dialer/main/impl/MainSearchController.java b/java/com/android/dialer/main/impl/MainSearchController.java index b04e7b11b..dbeed0d69 100644 --- a/java/com/android/dialer/main/impl/MainSearchController.java +++ b/java/com/android/dialer/main/impl/MainSearchController.java @@ -140,7 +140,7 @@ public class MainSearchController implements SearchBarListener { fab.hide(); toolbar.slideUp(animate, fragmentContainer); - toolbar.expand(animate, Optional.absent()); + toolbar.expand(animate, Optional.absent(), /* requestFocus */ false); toolbarShadow.setVisibility(View.VISIBLE); activity.setTitle(R.string.dialpad_activity_title); @@ -390,7 +390,7 @@ public class MainSearchController implements SearchBarListener { Logger.get(activity).logScreenView(ScreenEvent.Type.MAIN_SEARCH, activity); fab.hide(); - toolbar.expand(/* animate=*/ true, query); + toolbar.expand(/* animate=*/ true, query, /* requestFocus */ true); toolbar.showKeyboard(); toolbarShadow.setVisibility(View.VISIBLE); hideBottomNav(); @@ -528,12 +528,15 @@ public class MainSearchController implements SearchBarListener { if (savedInstanceState.getBoolean(KEY_IS_FAB_HIDDEN, false)) { fab.hide(); } - if (savedInstanceState.getBoolean(KEY_IS_TOOLBAR_EXPANDED, false)) { - toolbar.expand(false, Optional.absent()); - } - if (savedInstanceState.getBoolean(KEY_IS_TOOLBAR_SLIDE_UP, false)) { + boolean isSlideUp = savedInstanceState.getBoolean(KEY_IS_TOOLBAR_SLIDE_UP, false); + if (isSlideUp) { toolbar.slideUp(false, fragmentContainer); } + if (savedInstanceState.getBoolean(KEY_IS_TOOLBAR_EXPANDED, false)) { + // If the toolbar is slide up, that means the dialpad is showing. Thus we don't want to + // request focus or we'll break physical/bluetooth keyboards typing. + toolbar.expand(/* animate */ false, Optional.absent(), /* requestFocus */ !isSlideUp); + } } public void addOnSearchShowListener(OnSearchShowListener listener) { |