Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4f637c6 authored by Winson Chung's avatar Winson Chung
Browse files

Disallow secondary home handle when in multiwindow 

Change-Id: Iae63dee685eb12ce49174ead6136b259352b44ae
Bug: 157653375
Test: Enter splitscreen, tap nav in portrait, open the ime and then
      rotate to landscape
parent 0bf898f7

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java

+3 −5
Original line number Diff line number Diff line
@@ -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);