diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-07 01:26:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-07 01:26:59 +0000 |
| commit | ce62c87e280ff90ef602b438bf9a5daec2a8b16d (patch) | |
| tree | d610853faa402cbd3d6f0ce514ea0ed8b794c513 /java/com/android/dialer/main/impl/toolbar/MainToolbar.java | |
| parent | 1ab138ae73314be6a54ee8d3aed18548f80be05e (diff) | |
| parent | 7c4d9bb81e738698ff5fd2392c62b547190fc7d9 (diff) | |
Merge changes I5e4a4ada,I792a6f03
* changes:
Convert new speed dial to support fragment and add it to new peer.
Only request focus on search edit text when it's slide down.
Diffstat (limited to 'java/com/android/dialer/main/impl/toolbar/MainToolbar.java')
| -rw-r--r-- | java/com/android/dialer/main/impl/toolbar/MainToolbar.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/dialer/main/impl/toolbar/MainToolbar.java b/java/com/android/dialer/main/impl/toolbar/MainToolbar.java index 68876dde5..5e5db2c8c 100644 --- a/java/com/android/dialer/main/impl/toolbar/MainToolbar.java +++ b/java/com/android/dialer/main/impl/toolbar/MainToolbar.java @@ -113,9 +113,9 @@ public final class MainToolbar extends Toolbar implements PopupMenu.OnMenuItemCl searchBar.collapse(animate); } - /** @see SearchBarView#collapse(boolean) */ - public void expand(boolean animate, Optional<String> text) { - searchBar.expand(animate, text); + /** @see SearchBarView#expand(boolean, Optional, boolean) */ + public void expand(boolean animate, Optional<String> text, boolean requestFocus) { + searchBar.expand(animate, text, requestFocus); } public boolean isSlideUp() { |