diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-19 02:32:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-19 02:32:58 +0000 |
| commit | e7194f7204e0b694106fcaa3cb9d3d3171c92858 (patch) | |
| tree | 2b045b00d3e609a80196b2a10b829305d6dacbeb /java/com/android/dialer/main/impl/toolbar/MainToolbar.java | |
| parent | 8c3420c5f10bcde9475835d8e93aa2b6cb5a9d17 (diff) | |
| parent | 5d272d8c24b2719cacd4940d418efb3559a1fb09 (diff) | |
Merge changes I59b5f641,If438f1b7
* changes:
Search, Dialpad, BottomBar and Toolbar now persist state through rotation.
Descrease bubble bottom text scaling factor.
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, 4 insertions, 2 deletions
diff --git a/java/com/android/dialer/main/impl/toolbar/MainToolbar.java b/java/com/android/dialer/main/impl/toolbar/MainToolbar.java index 6e38d2e64..1d7f7ce20 100644 --- a/java/com/android/dialer/main/impl/toolbar/MainToolbar.java +++ b/java/com/android/dialer/main/impl/toolbar/MainToolbar.java @@ -17,7 +17,6 @@ package com.android.dialer.main.impl.toolbar; import android.content.Context; -import android.support.annotation.VisibleForTesting; import android.support.v7.widget.PopupMenu.OnMenuItemClickListener; import android.support.v7.widget.Toolbar; import android.util.AttributeSet; @@ -107,11 +106,14 @@ public final class MainToolbar extends Toolbar implements OnMenuItemClickListene searchBar.expand(animate, text); } - @VisibleForTesting public boolean isSlideUp() { return isSlideUp; } + public boolean isExpanded() { + return searchBar.isExpanded(); + } + public String getQuery() { return searchBar.getQuery(); } |