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

Merge "Catching additional case where menu would disappear in accessibility." into oc-dev

Browse Source 
am: 6a9f4a997c

Change-Id: I1473f065885e599cb04e045f0096826ed02f417f
This commit is contained in:
Winson Chung
2017-04-04 22:47:22 +00:00
committed by android-build-merger
parent 368628cd8e 6a9f4a997c
commit 7c3db61d91
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
View File

@@ -86,6 +86,7 @@ public class PipMenuActivity extends Activity {
private static final float DISABLED_ACTION_ALPHA = 0.54f;
private boolean mMenuVisible;
private boolean mAllowMenuTimeout = true;
private final List<RemoteAction> mActions = new ArrayList<>();
private View mViewRoot;
private Drawable mBackgroundDrawable;
@@ -190,7 +191,9 @@ public class PipMenuActivity extends Activity {
@Override
public void onUserInteraction() {
repostDelayedFinish(POST_INTERACTION_DISMISS_DELAY);
if (mAllowMenuTimeout) {
repostDelayedFinish(POST_INTERACTION_DISMISS_DELAY);
}
}
@Override
@@ -255,6 +258,7 @@ public class PipMenuActivity extends Activity {
}
private void showMenu(Rect stackBounds, Rect movementBounds, boolean allowMenuTimeout) {
mAllowMenuTimeout = allowMenuTimeout;
if (!mMenuVisible) {
updateActionViews(stackBounds);
if (mMenuContainerAnimator != null) {