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

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

Browse Source
This commit is contained in:
Winson Chung
2020-05-29 16:49:58 +00:00
committed by Android (Google) Code Review
parent 3420744449 c4f637c64b
commit d763654b24
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,6 @@ import com.android.systemui.recents.OverviewProxyService;
import com.android.systemui.recents.Recents; import com.android.systemui.recents.Recents;
import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.QuickStepContract;
import com.android.systemui.shared.system.TaskStackChangeListener;
import com.android.systemui.stackdivider.Divider; import com.android.systemui.stackdivider.Divider;
import com.android.systemui.statusbar.AutoHideUiElement; import com.android.systemui.statusbar.AutoHideUiElement;
import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.CommandQueue;
@@ -179,8 +178,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
private final Lazy<StatusBar> mStatusBarLazy; private final Lazy<StatusBar> mStatusBarLazy;
private final ShadeController mShadeController; private final ShadeController mShadeController;
private final NotificationRemoteInputManager mNotificationRemoteInputManager; private final NotificationRemoteInputManager mNotificationRemoteInputManager;
private Recents mRecents;
private StatusBar mStatusBar;
private final Divider mDivider; private final Divider mDivider;
private final Optional<Recents> mRecentsOptional; private final Optional<Recents> mRecentsOptional;
private WindowManager mWindowManager; private WindowManager mWindowManager;
@@ -222,7 +219,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
*/ */
private NavigationHandle mOrientationHandle; private NavigationHandle mOrientationHandle;
private WindowManager.LayoutParams mOrientationParams; private WindowManager.LayoutParams mOrientationParams;
private boolean mFrozenTasks;
private int mStartingQuickSwitchRotation; private int mStartingQuickSwitchRotation;
private int mCurrentRotation; private int mCurrentRotation;
private boolean mFixedRotationEnabled; private boolean mFixedRotationEnabled;
@@ -584,7 +580,9 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
return; 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(); resetSecondaryHandle();
} else { } else {
int deltaRotation = deltaRotation(mCurrentRotation, mStartingQuickSwitchRotation); int deltaRotation = deltaRotation(mCurrentRotation, mStartingQuickSwitchRotation);