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

Commit f8dc50c4 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Disallow secondary home handle when in multiwindow" into rvc-dev...

Merge "Merge "Disallow secondary home handle when in multiwindow" into rvc-dev am: d763654b am: a32a0049" into rvc-d1-dev-plus-aosp
parents 48180236 b9d44886
Loading
Loading
Loading
Loading
+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);