summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
index 54511c775fda..26e80adafd3d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
@@ -111,7 +111,6 @@ import com.android.systemui.recents.OverviewProxyService;
import com.android.systemui.recents.Recents;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.shared.system.QuickStepContract;
-import com.android.systemui.shared.system.TaskStackChangeListener;
import com.android.systemui.stackdivider.Divider;
import com.android.systemui.statusbar.AutoHideUiElement;
import com.android.systemui.statusbar.CommandQueue;
@@ -179,8 +178,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
private final Lazy<StatusBar> mStatusBarLazy;
private final ShadeController mShadeController;
private final NotificationRemoteInputManager mNotificationRemoteInputManager;
- private Recents mRecents;
- private StatusBar mStatusBar;
private final Divider mDivider;
private final Optional<Recents> mRecentsOptional;
private WindowManager mWindowManager;
@@ -222,7 +219,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
*/
private NavigationHandle mOrientationHandle;
private WindowManager.LayoutParams mOrientationParams;
- private boolean mFrozenTasks;
private int mStartingQuickSwitchRotation;
private int mCurrentRotation;
private boolean mFixedRotationEnabled;
@@ -584,7 +580,9 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
return;
}
- if (mStartingQuickSwitchRotation == -1) {
+ if (mStartingQuickSwitchRotation == -1 || mDivider.isDividerVisible()) {
+ // Hide the secondary home handle if we are in multiwindow since apps in multiwindow
+ // aren't allowed to set the display orientation
resetSecondaryHandle();
} else {
int deltaRotation = deltaRotation(mCurrentRotation, mStartingQuickSwitchRotation);