From bdb0e494b63f4e4e2974d5671a8c336dfa6357fc Mon Sep 17 00:00:00 2001 From: Shunta Sato Date: Fri, 14 Apr 2017 16:01:54 +0900 Subject: Enable "Reboot to safe mode" confirmation on GlobalActions Android N or prior GlobalActions showed "Reboot to safe mode", when user do long-press of "power off" button on GlobalActions. Currently, no confirmation dialog is shown. It's not user friendly. This commit make it enable again. - Also dismiss global actions on long press. Test: manual Bug: 37333890 Change-Id: I3bfefff3cd34ba35b003281e94a4181cebb74fcf --- .../src/com/android/systemui/globalactions/GlobalActionsDialog.java | 1 + .../core/java/com/android/server/statusbar/StatusBarManagerService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 80a641870f5b..1a8a474a4187 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -339,6 +339,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn long id) { final Action action = mAdapter.getItem(position); if (action instanceof LongPressAction) { + mDialog.dismiss(); return ((LongPressAction) action).onLongPress(); } return false; diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 32871bb0ba2c..984b40f806bb 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -783,7 +783,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub { mHandler.post(() -> { // ShutdownThread displays UI, so give it a UI context. if (safeMode) { - ShutdownThread.rebootSafeMode(getUiContext(), false); + ShutdownThread.rebootSafeMode(getUiContext(), true); } else { ShutdownThread.reboot(getUiContext(), PowerManager.SHUTDOWN_USER_REQUESTED, false); -- cgit v1.2.3-59-g8ed1b