Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add feature flag to enable skip direction mapping" into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-12 17:49:26 +00:00
committed by Android (Google) Code Review
parent bb8962e90e 4844d722a9
commit 79f7ac9922
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/provider/Settings.java
View File

@@ -7755,6 +7755,20 @@ public final class Settings {
private static final Validator SKIP_GESTURE_COUNT_VALIDATOR =
NON_NEGATIVE_INTEGER_VALIDATOR;
/**
* Direction to advance media for skip gesture
* @hide
*/
public static final String SKIP_DIRECTION = "skip_gesture_direction";
/**
* Only used if FeatureFlag "settings_skip_direction_mutable" is enabled.
* If feature flag is disabled, should assume SKIP_DIRECTION = 0.
* 0 / false = right to left to advance to next
* 1 / true = left to right to advance to next
*/
private static final Validator SKIP_DIRECTION_VALIDATOR = BOOLEAN_VALIDATOR;
/**
* Gesture that silences sound (alarms, notification, calls).
* @hide
@@ -8992,6 +9006,7 @@ public final class Settings {
UI_NIGHT_MODE,
LOCK_SCREEN_WHEN_TRUST_LOST,
SKIP_GESTURE,
SKIP_DIRECTION,
SILENCE_GESTURE,
THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
NAVIGATION_MODE,
@@ -9178,6 +9193,8 @@ public final class Settings {
VALIDATORS.put(LOCK_SCREEN_CUSTOM_CLOCK_FACE, LOCK_SCREEN_CUSTOM_CLOCK_FACE_VALIDATOR);
VALIDATORS.put(LOCK_SCREEN_WHEN_TRUST_LOST, LOCK_SCREEN_WHEN_TRUST_LOST_VALIDATOR);
VALIDATORS.put(SKIP_GESTURE, SKIP_GESTURE_VALIDATOR);
VALIDATORS.put(SKIP_DIRECTION, SKIP_DIRECTION_VALIDATOR);
VALIDATORS.put(SKIP_DIRECTION, SKIP_DIRECTION_VALIDATOR);
VALIDATORS.put(SILENCE_GESTURE, SILENCE_GESTURE_VALIDATOR);
VALIDATORS.put(THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
THEME_CUSTOMIZATION_OVERLAY_PACKAGES_VALIDATOR);

1
core/java/android/util/FeatureFlagUtils.java
View File

@@ -57,6 +57,7 @@ public class FeatureFlagUtils {
DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false");
DEFAULT_FLAGS.put(PIXEL_WALLPAPER_CATEGORY_SWITCH, "false");
DEFAULT_FLAGS.put("settings_wifi_details_datausage_header", "false");
DEFAULT_FLAGS.put("settings_skip_direction_mutable", "true");
}
/**