Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "FloatingToolbar: Hide panels when they\'re invisible." into nyc-dev

Browse Source 
am: 2e303d2

* commit '2e303d20c6d2fe02c45070eaec8b53f8e2eff5e3':
  FloatingToolbar: Hide panels when they're invisible.
This commit is contained in:
Abodunrinwa Toki
2016-03-18 15:35:27 +00:00
committed by android-build-merger
parent 3aeb4c4616 2e303d20c6
commit 6e005e2e73
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/com/android/internal/widget/FloatingToolbar.java
View File

@@ -308,9 +308,6 @@ public final class FloatingToolbar {
private static final int MIN_OVERFLOW_SIZE = 2; private static final int MIN_OVERFLOW_SIZE = 2;
private static final int MAX_OVERFLOW_SIZE = 4; private static final int MAX_OVERFLOW_SIZE = 4;
/* The duration of the overflow button vector animation duration. */
private static final int OVERFLOW_BUTTON_ANIMATION_DELAY = 400;
private final Context mContext; private final Context mContext;
private final View mParent; // Parent for the popup window. private final View mParent; // Parent for the popup window.
private final PopupWindow mPopupWindow; private final PopupWindow mPopupWindow;
@@ -377,18 +374,6 @@ public final class FloatingToolbar {
} }
}; };
/* Runnable to reset the overflow button's drawable after an overflow transition. */
private final Runnable mResetOverflowButtonDrawable = new Runnable() {
@Override
public void run() {
if (mIsOverflowOpen) {
mOverflowButton.setImageDrawable(mArrow);
} else {
mOverflowButton.setImageDrawable(mOverflow);
}
}
};
private boolean mDismissed = true; // tracks whether this popup is dismissed or dismissing. private boolean mDismissed = true; // tracks whether this popup is dismissed or dismissing.
private boolean mHidden; // tracks whether this popup is hidden or hiding. private boolean mHidden; // tracks whether this popup is hidden or hiding.
@@ -902,7 +887,9 @@ public final class FloatingToolbar {
final Size containerSize = mOverflowPanelSize; final Size containerSize = mOverflowPanelSize;
setSize(mContentContainer, containerSize); setSize(mContentContainer, containerSize);
mMainPanel.setAlpha(0); mMainPanel.setAlpha(0);
mMainPanel.setVisibility(View.INVISIBLE);
mOverflowPanel.setAlpha(1); mOverflowPanel.setAlpha(1);
mOverflowPanel.setVisibility(View.VISIBLE);
mOverflowButton.setImageDrawable(mArrow); mOverflowButton.setImageDrawable(mArrow);
// Update x-coordinates depending on RTL state. // Update x-coordinates depending on RTL state.
@@ -941,7 +928,9 @@ public final class FloatingToolbar {
final Size containerSize = mMainPanelSize; final Size containerSize = mMainPanelSize;
setSize(mContentContainer, containerSize); setSize(mContentContainer, containerSize);
mMainPanel.setAlpha(1); mMainPanel.setAlpha(1);
mMainPanel.setVisibility(View.VISIBLE);
mOverflowPanel.setAlpha(0); mOverflowPanel.setAlpha(0);
mOverflowPanel.setVisibility(View.INVISIBLE);
mOverflowButton.setImageDrawable(mOverflow); mOverflowButton.setImageDrawable(mOverflow);
if (hasOverflow()) { if (hasOverflow()) {
@@ -1327,8 +1316,6 @@ public final class FloatingToolbar {
mToArrow.start(); mToArrow.start();
openOverflow(); openOverflow();
} }
overflowButton.postDelayed(
mResetOverflowButtonDrawable, OVERFLOW_BUTTON_ANIMATION_DELAY);
} }
}); });
return overflowButton; return overflowButton;
@@ -1389,6 +1376,10 @@ public final class FloatingToolbar {
// Disable the overflow button while it's animating. // Disable the overflow button while it's animating.
// It will be re-enabled when the animation stops. // It will be re-enabled when the animation stops.
mOverflowButton.setEnabled(false); mOverflowButton.setEnabled(false);
// Ensure both panels have visibility turned on when the overflow animation
// starts.
mMainPanel.setVisibility(View.VISIBLE);
mOverflowPanel.setVisibility(View.VISIBLE);
} }
@Override @Override