diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2019-05-26 07:30:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-26 07:30:42 +0000 |
| commit | eada1380b1dbb44e673fd3782b777ff9f3ef92bb (patch) | |
| tree | b0f3113f6d7ced5abe34fbea4e03240de83a90c9 /core/java/android | |
| parent | 85dcca9b694c7128530016edbaa420b9978cb0d6 (diff) | |
| parent | 83972396f2fbf9e6838e32b3723544684df735aa (diff) | |
Merge "Add navigation mode to Settings.Secure" into qt-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 8096eb110a1c..66b9d168d71d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8830,6 +8830,18 @@ public final class Settings { SettingsValidators.JSON_OBJECT_VALIDATOR; /** + * Navigation bar mode. + * 0 = 3 button + * 1 = 2 button + * 2 = fully gestural + * @hide + */ + public static final String NAVIGATION_MODE = + "navigation_mode"; + private static final Validator NAVIGATION_MODE_VALIDATOR = + new SettingsValidators.DiscreteValueValidator(new String[] {"0", "1", "2"}); + + /** * Controls whether aware is enabled. * @hide */ @@ -8972,6 +8984,7 @@ public final class Settings { SKIP_GESTURE, SILENCE_GESTURE, THEME_CUSTOMIZATION_OVERLAY_PACKAGES, + NAVIGATION_MODE, AWARE_ENABLED, SKIP_GESTURE_COUNT, SILENCE_ALARMS_GESTURE_COUNT, @@ -9157,6 +9170,7 @@ public final class Settings { VALIDATORS.put(SILENCE_GESTURE, SILENCE_GESTURE_VALIDATOR); VALIDATORS.put(THEME_CUSTOMIZATION_OVERLAY_PACKAGES, THEME_CUSTOMIZATION_OVERLAY_PACKAGES_VALIDATOR); + VALIDATORS.put(NAVIGATION_MODE, NAVIGATION_MODE_VALIDATOR); VALIDATORS.put(AWARE_ENABLED, AWARE_ENABLED_VALIDATOR); VALIDATORS.put(SKIP_GESTURE_COUNT, SKIP_GESTURE_COUNT_VALIDATOR); VALIDATORS.put(SILENCE_ALARMS_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR); |