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

Merge "Only show Pip actions when menu is FULL (i.e. shown)" into sc-dev

Browse Source
This commit is contained in:
Jorge Gil
2021-02-03 17:02:58 +00:00
committed by Android (Google) Code Review
parent 1ddf2b3ac4 bf7df8a8a3
commit f2abb387f5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
View File

@@ -231,7 +231,6 @@ public class PipMenuView extends FrameLayout {
&& (mMenuState == MENU_STATE_FULL || menuState == MENU_STATE_FULL);
mAllowTouches = !disallowTouchesUntilAnimationEnd;
cancelDelayedHide();
updateActionViews(stackBounds);
if (mMenuContainerAnimator != null) {
mMenuContainerAnimator.cancel();
}
@@ -280,6 +279,7 @@ public class PipMenuView extends FrameLayout {
setVisibility(VISIBLE);
mMenuContainerAnimator.start();
}
updateActionViews(stackBounds);
} else {
// If we are already visible, then just start the delayed dismiss and unregister any
// existing input consumers from the previous drag
@@ -395,7 +395,7 @@ public class PipMenuView extends FrameLayout {
return true;
});
if (mActions.isEmpty() || mMenuState == MENU_STATE_CLOSE) {
if (mActions.isEmpty() || mMenuState == MENU_STATE_CLOSE || mMenuState == MENU_STATE_NONE) {
actionsContainer.setVisibility(View.INVISIBLE);
} else {
actionsContainer.setVisibility(View.VISIBLE);