From a3e15b8c16e01a3a8bcf94e676fe46d1c80dfb0a Mon Sep 17 00:00:00 2001 From: "Wesley.CW Wang" Date: Mon, 12 Nov 2018 13:04:02 +0800 Subject: [PATCH] RESTRICT AUTOMERGE: Disable separated emergency button Test: Manually Bug: 119384606 Change-Id: I629dd42751dc80ccd434d66f95eabefc9a8164af --- .../com/android/systemui/globalactions/GlobalActionsDialog.java | 2 +- 1 file changed, 1 insertion(+), 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 897ab88215ef6..dc1d457cc484d 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -318,7 +318,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, ArraySet addedKeys = new ArraySet(); mHasLogoutButton = false; mHasLockdownButton = false; - mSeparatedEmergencyButtonEnabled = true; + mSeparatedEmergencyButtonEnabled = false; for (int i = 0; i < defaultActions.length; i++) { String actionKey = defaultActions[i]; if (addedKeys.contains(actionKey)) {