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

Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev

Browse Source
This commit is contained in:
Abodunrinwa Toki
2015-04-29 19:57:46 +00:00
committed by Android (Google) Code Review
parent 5686780404 c23ac32601
commit 05a56db39d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,6 +438,9 @@ public final class FloatingToolbar {
// Make sure a panel is set as the content. // Make sure a panel is set as the content.
if (mContentContainer.getChildCount() == 0) { if (mContentContainer.getChildCount() == 0) {
setMainPanelAsContent(); setMainPanelAsContent();
// If we're yet to show the popup, set the container visibility to zero.
// The "show" animation will make this visible.
mContentContainer.setAlpha(0);
} }
preparePopupContent(); preparePopupContent();
mPopupWindow.showAtLocation(mParent, Gravity.NO_GRAVITY, x, y); mPopupWindow.showAtLocation(mParent, Gravity.NO_GRAVITY, x, y);
@@ -478,7 +481,7 @@ public final class FloatingToolbar {
* Returns {@code true} if this popup is currently showing. {@code false} otherwise. * Returns {@code true} if this popup is currently showing. {@code false} otherwise.
*/ */
public boolean isShowing() { public boolean isShowing() {
return mPopupWindow.isShowing() && !mDismissed && !mHidden; return !mDismissed && !mHidden;
} }
/** /**
@@ -494,7 +497,7 @@ public final class FloatingToolbar {
* This is a no-op if this popup is not showing. * This is a no-op if this popup is not showing.
*/ */
public void updateCoordinates(int x, int y) { public void updateCoordinates(int x, int y) {
if (!isShowing()) { if (!isShowing() || !mPopupWindow.isShowing()) {
return; return;
} }