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

Merge "Only use grid layout for power menu when wallet is visible" into qt-dev

Browse Source 
am: 31b3161a4e

Change-Id: Iad7cd7fd7316446a91a10003528bc15d4616d46c
This commit is contained in:
Steve Elliott
2019-05-23 15:40:39 -07:00
committed by android-build-merger
parent b27cb09c93 31b3161a4e
commit 07733b7cb2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
View File

@@ -1631,8 +1631,10 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
}
private int getGlobalActionsLayoutId(Context context) {
boolean useGridLayout = isForceGridEnabled(context) || shouldUsePanel();
if (RotationUtils.getRotation(context) == RotationUtils.ROTATION_SEASCAPE) {
int rotation = RotationUtils.getRotation(context);
boolean useGridLayout = isForceGridEnabled(context)
|| (shouldUsePanel() && rotation == RotationUtils.ROTATION_NONE);
if (rotation == RotationUtils.ROTATION_SEASCAPE) {
if (useGridLayout) {
return com.android.systemui.R.layout.global_actions_grid_seascape;
} else {