Simplify GlobalActionsFlatLayout and fix dismiss
Add a touch handler to the ScrollView container to catch touches
outside of the power, wallet, and controls UIs.
Adjust MultiListLayout and GloblActionsLayout to allow a very
simple row-based layout for the new power menu design, instead
of having to use ListGridLayout.
Extract the AirplaneMode action into its own class, instead of
defining it inline.
Bump emergency to the top of the list of global actions to
ensure it's top-priority and positioned correctly for global
actions layouts without a separated view.
Fixes: 149299063
Test: Manual. Enable quick controls -- tapping beneath the controls
area should dismiss the GlobalActionsDialog. Dismissing should
still work in either the grid (no Controls) or column (no wallet
or controls) layouts. Tapping actions, swiping cards in Quick
Access Wallet, and interacting with control items should still
work as expected.
Change-Id: Iad32045837edb0be6c9f36ec5d663483bda6f5de
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index d298b99..ef0be88b 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -335,45 +335,7 @@
} else {
mSilentModeAction = new SilentModeTriStateAction(mAudioManager, mHandler);
}
- mAirplaneModeOn = new ToggleAction(
- R.drawable.ic_lock_airplane_mode,
- R.drawable.ic_lock_airplane_mode_off,
- R.string.global_actions_toggle_airplane_mode,
- R.string.global_actions_airplane_mode_on_status,
- R.string.global_actions_airplane_mode_off_status) {
-
- void onToggle(boolean on) {
- if (mHasTelephony && TelephonyProperties.in_ecm_mode().orElse(false)) {
- mIsWaitingForEcmExit = true;
- // Launch ECM exit dialog
- Intent ecmDialogIntent =
- new Intent(TelephonyManager.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null);
- ecmDialogIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- mContext.startActivity(ecmDialogIntent);
- } else {
- changeAirplaneModeSystemSetting(on);
- }
- }
-
- @Override
- protected void changeStateFromPress(boolean buttonOn) {
- if (!mHasTelephony) return;
-
- // In ECM mode airplane state cannot be changed
- if (!TelephonyProperties.in_ecm_mode().orElse(false)) {
- mState = buttonOn ? State.TurningOn : State.TurningOff;
- mAirplaneState = mState;
- }
- }
-
- public boolean showDuringKeyguard() {
- return true;
- }
-
- public boolean showBeforeProvisioning() {
- return false;
- }
- };
+ mAirplaneModeOn = new AirplaneModeAction();
onAirplaneModeChanged();
mItems = new ArrayList<Action>();
@@ -537,7 +499,7 @@
@Override
public boolean shouldBeSeparated() {
- return !shouldShowControls();
+ return true;
}
@Override
@@ -1333,6 +1295,48 @@
}
}
+ private class AirplaneModeAction extends ToggleAction {
+ AirplaneModeAction() {
+ super(
+ R.drawable.ic_lock_airplane_mode,
+ R.drawable.ic_lock_airplane_mode_off,
+ R.string.global_actions_toggle_airplane_mode,
+ R.string.global_actions_airplane_mode_on_status,
+ R.string.global_actions_airplane_mode_off_status);
+ }
+ void onToggle(boolean on) {
+ if (mHasTelephony && TelephonyProperties.in_ecm_mode().orElse(false)) {
+ mIsWaitingForEcmExit = true;
+ // Launch ECM exit dialog
+ Intent ecmDialogIntent =
+ new Intent(TelephonyManager.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null);
+ ecmDialogIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ mContext.startActivity(ecmDialogIntent);
+ } else {
+ changeAirplaneModeSystemSetting(on);
+ }
+ }
+
+ @Override
+ protected void changeStateFromPress(boolean buttonOn) {
+ if (!mHasTelephony) return;
+
+ // In ECM mode airplane state cannot be changed
+ if (!TelephonyProperties.in_ecm_mode().orElse(false)) {
+ mState = buttonOn ? State.TurningOn : State.TurningOff;
+ mAirplaneState = mState;
+ }
+ }
+
+ public boolean showDuringKeyguard() {
+ return true;
+ }
+
+ public boolean showBeforeProvisioning() {
+ return false;
+ }
+ }
+
private class SilentModeToggleAction extends ToggleAction {
public SilentModeToggleAction() {
super(R.drawable.ic_audio_vol_mute,
@@ -1555,6 +1559,7 @@
private ControlsUiController mControlsUiController;
private ViewGroup mControlsView;
+ private ViewGroup mContainerView;
ActionsDialog(Context context, MyAdapter adapter,
GlobalActionsPanelPlugin.PanelViewController plugin, BlurUtils blurUtils,
@@ -1672,6 +1677,14 @@
mScrimAlpha = ScrimController.BUSY_SCRIM_ALPHA;
}
getWindow().setBackgroundDrawable(mBackgroundDrawable);
+
+ if (mControlsView != null) {
+ mContainerView = findViewById(com.android.systemui.R.id.global_actions_container);
+ mContainerView.setOnTouchListener((v, e) -> {
+ dismiss();
+ return true;
+ });
+ }
}
private void fixNavBarClipping() {
@@ -1894,14 +1907,6 @@
return isPanelDebugModeEnabled(context);
}
-
- /**
- * Determines whether the Global Actions menu should use a separated view for emergency actions.
- */
- private static boolean shouldUseSeparatedView() {
- return true;
- }
-
private boolean shouldShowControls() {
return !mKeyguardManager.isDeviceLocked()
&& mControlsUiController.getAvailable();