diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-18 01:23:56 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-18 01:23:56 +0000 |
commit | f64050db4237ac8717ea6a13f96bec3c77dcaa15 (patch) | |
tree | bfeb13503fdd296d10b93b78d0e819b09616aa2a /java | |
parent | 204130ce0391e8b7f29cfc52b75f0886fe9c01bb (diff) | |
parent | 9e22d509e878c2c2991061c11a2198a6e46e919e (diff) |
Merge "Don't slide the toolbar up if we've scheduled a runnable to slide it up."
Diffstat (limited to 'java')
-rw-r--r-- | java/com/android/dialer/main/impl/toolbar/MainToolbar.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/java/com/android/dialer/main/impl/toolbar/MainToolbar.java b/java/com/android/dialer/main/impl/toolbar/MainToolbar.java index 5e5db2c8c..851d7a0b4 100644 --- a/java/com/android/dialer/main/impl/toolbar/MainToolbar.java +++ b/java/com/android/dialer/main/impl/toolbar/MainToolbar.java @@ -42,6 +42,7 @@ public final class MainToolbar extends Toolbar implements PopupMenu.OnMenuItemCl private SearchBarListener listener; private MainToolbarMenu overflowMenu; private boolean isSlideUp; + private boolean hasGlobalLayoutListener; public MainToolbar(Context context, AttributeSet attrs) { super(context, attrs); @@ -72,9 +73,20 @@ public final class MainToolbar extends Toolbar implements PopupMenu.OnMenuItemCl /** Slides the toolbar up and off the screen. */ public void slideUp(boolean animate, View container) { + if (hasGlobalLayoutListener) { + // Return early since we've already scheduled the toolbar to slide up + return; + } + Assert.checkArgument(!isSlideUp); if (getHeight() == 0) { - ViewUtil.doOnGlobalLayout(this, view -> slideUp(animate, container)); + hasGlobalLayoutListener = true; + ViewUtil.doOnGlobalLayout( + this, + view -> { + hasGlobalLayoutListener = false; + slideUp(animate, container); + }); return; } isSlideUp = true; |