diff options
author | calderwoodra <calderwoodra@google.com> | 2018-04-16 12:35:09 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-04-16 14:42:29 -0700 |
commit | c298ec9c33d105971dbe612cd7798f5e9af34f71 (patch) | |
tree | 6503d8366ab7a52cc60ce4496b5a0e41deae5451 | |
parent | d94c00d6629da03c96a101781fbc21e0daca8db8 (diff) |
Don't close search if the user leaves with the dialpad open.
Bug: 77736276
Test: MainActivityOldPeerSearchIntegrationTest
PiperOrigin-RevId: 193081987
Change-Id: I466b6094f4d7851033be3bf68f170485a2ec733d
-rw-r--r-- | java/com/android/dialer/main/impl/MainSearchController.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/com/android/dialer/main/impl/MainSearchController.java b/java/com/android/dialer/main/impl/MainSearchController.java index dbeed0d69..b9a6654b6 100644 --- a/java/com/android/dialer/main/impl/MainSearchController.java +++ b/java/com/android/dialer/main/impl/MainSearchController.java @@ -95,6 +95,8 @@ public class MainSearchController implements SearchBarListener { * want to wait until onPause is called otherwise the transition will look extremely janky. */ private boolean closeSearchOnPause; + + private boolean callPlacedFromSearch; private boolean requestingPermission; public MainSearchController( @@ -472,10 +474,11 @@ public class MainSearchController implements SearchBarListener { closeKeyboard(); if (closeSearchOnPause) { - closeSearchOnPause = false; - if (isInSearch()) { + if (isInSearch() && (callPlacedFromSearch || !isDialpadVisible())) { closeSearch(false); } + closeSearchOnPause = false; + callPlacedFromSearch = false; } } @@ -494,6 +497,7 @@ public class MainSearchController implements SearchBarListener { @Override public void onCallPlacedFromSearch() { closeSearchOnPause = true; + callPlacedFromSearch = true; } @Override |