diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-23 20:03:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-23 20:03:28 +0000 |
| commit | 602563008ae1c0acc873fd183ce298e199949677 (patch) | |
| tree | 4c8800807d19285806ab0bad55c8b788f1691e25 /java/com/android/dialer/main/impl/toolbar/SearchBarView.java | |
| parent | 5feae4d9f7b3685be38b48c1806ceb03c6b2273c (diff) | |
| parent | bf7e8854806ce55c7fd298940fca52d013a02e89 (diff) | |
Merge changes I71e70d6f,I40955c6e,I70ed303b
* changes:
Bubble change when display size change.
Update Assisted Dialing references.
Pressing back button twice really quickly no longer crashes dialer.
Diffstat (limited to 'java/com/android/dialer/main/impl/toolbar/SearchBarView.java')
| -rw-r--r-- | java/com/android/dialer/main/impl/toolbar/SearchBarView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java index c84b8fc72..95929383b 100644 --- a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java +++ b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java @@ -82,6 +82,10 @@ final class SearchBarView extends FrameLayout { } private void onSearchBackButtonClicked() { + if (!isExpanded) { + return; + } + listener.onSearchBackButtonClicked(); collapse(true); } |