summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-05-30 01:23:04 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-05-30 01:23:04 +0000
commitba6c3e72698e6a71b4896d0b17a825b9380b68a7 (patch)
tree27d09320e072fb84fcc5865413c7d6571643acc6
parentdac6071acac754d5b31a3410b8bca4506bb39680 (diff)
parent9d1df59f122224b33e5d7d1c52397ca1de68ae8e (diff)
Merge "PIP: Allow sub-classes to access MenuController." into rvc-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
index ba8e8106ffd0..b714bff15d8a 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
@@ -79,13 +79,13 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio
private PipBoundsHandler mPipBoundsHandler;
private InputConsumerController mInputConsumerController;
- private PipMenuActivityController mMenuController;
private PipMediaController mMediaController;
private PipTouchHandler mTouchHandler;
private PipAppOpsListener mAppOpsListener;
private IPinnedStackAnimationListener mPinnedStackAnimationRecentsListener;
private boolean mIsInFixedRotation;
+ protected PipMenuActivityController mMenuController;
protected PipTaskOrganizer mPipTaskOrganizer;
/**