commit a3e15b8c16e01a3a8bcf94e676fe46d1c80dfb0a
author Wesley.CW Wang <wesleycwwang@google.com> Mon Nov 12 13:04:02 2018 +0800
committer Wesley Wang <wesleycwwang@google.com> Mon Nov 12 08:01:03 2018 +0000
tree 619b4d5bf29725f9537aa5d15e7859957eddfbb7
parent 6018662e18e871c085f2f09753f121cfb8afaa91

RESTRICT AUTOMERGE: Disable separated emergency button

Test: Manually
Bug: 119384606
Change-Id: I629dd42751dc80ccd434d66f95eabefc9a8164af

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index 897ab88..dc1d457 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 @@
         ArraySet<String> addedKeys = new ArraySet<String>();
         mHasLogoutButton = false;
         mHasLockdownButton = false;
-        mSeparatedEmergencyButtonEnabled = true;
+        mSeparatedEmergencyButtonEnabled = false;
         for (int i = 0; i < defaultActions.length; i++) {
             String actionKey = defaultActions[i];
             if (addedKeys.contains(actionKey)) {