commit acb758392239846f1765c96b4f69559be078d75e
author Jaewan Kim <jaewan@google.com> Tue Apr 23 23:32:27 2013 +0900
committer Android (Google) Code Review <android-gerrit@google.com> Sun Apr 28 12:09:25 2013 +0000
tree 04435f2470b537849e7a4bfa62798f31a48f2a1f
parent 8429e5549286e0ec3a8594de1d88a27516f1e309

Remove Accessibility shortcut if the shortcut is not available

Bug: 8051556
Change-Id: Ic6b552e818a1bd2fea6fdae2e755f31420abfbe6

src/com/android/settings/AccessibilitySettings.java

diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 638aae6..59ea341 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -346,6 +346,15 @@
         // Global gesture.
         mGlobalGesturePreferenceScreen =
                 (PreferenceScreen) findPreference(ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN);
+        final int longPressOnPowerBehavior = getActivity().getResources().getInteger(
+                com.android.internal.R.integer.config_longPressOnPowerBehavior);
+        final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;
+        if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+                || longPressOnPowerBehavior != LONG_PRESS_POWER_GLOBAL_ACTIONS) {
+            // Remove accessibility shortcut if power key is not present
+            // nor long press power does not show global actions menu.
+            mSystemsCategory.removePreference(mGlobalGesturePreferenceScreen);
+        }
     }
 
     private void updateAllPreferences() {