commit 135d692639778325d961cb114eae1b2cb4741a47
author Svetoslav Ganov <svetoslavganov@google.com> Tue Apr 30 17:17:13 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 30 17:17:13 2013 +0000
tree 547fae15aecd79115e1e6c33b8ff911c5659f3da
parent 3d9918c2e27fbaaaef1278e99251b6dbcb0e09d3
parent acb758392239846f1765c96b4f69559be078d75e

Merge "Remove Accessibility shortcut if the shortcut is not available"

src/com/android/settings/AccessibilitySettings.java

diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index a4438d0..bd802cf 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -348,6 +348,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() {