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

This commit is contained in:
Svetoslav Ganov
2013-04-30 17:17:13 +00:00
committed by Android (Google) Code Review

View File

@@ -348,6 +348,15 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
// Global gesture. // Global gesture.
mGlobalGesturePreferenceScreen = mGlobalGesturePreferenceScreen =
(PreferenceScreen) findPreference(ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN); (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() { private void updateAllPreferences() {