Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26d4d356 authored by Yingzhe Li's avatar Yingzhe Li Committed by Android (Google) Code Review
Browse files

Merge "Add Setting for Wet Mode/Touch Lock Mode"

parents 8014c8a6 c2c7f90b

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -17210,6 +17210,12 @@ public final class Settings { 
             */

            public static final String CLOCKWORK_LONG_PRESS_TO_ASSISTANT_ENABLED =

                    "clockwork_long_press_to_assistant_enabled";













            /*













             * Whether the device has Wet Mode/ Touch Lock Mode enabled.













             * @hide













             */













            public static final String WET_MODE_ON = "wet_mode_on";















        }















    }







































packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -313,6 +313,7 @@ public class GlobalSettingsValidators {













        VALIDATORS.put(Global.USER_PREFERRED_REFRESH_RATE, NON_NEGATIVE_FLOAT_VALIDATOR);















        VALIDATORS.put(Global.USER_PREFERRED_RESOLUTION_HEIGHT, ANY_INTEGER_VALIDATOR);















        VALIDATORS.put(Global.USER_PREFERRED_RESOLUTION_WIDTH, ANY_INTEGER_VALIDATOR);













        VALIDATORS.put(Global.Wearable.WET_MODE_ON, BOOLEAN_VALIDATOR);















    }















}







































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -656,7 +656,8 @@ public class SettingsBackupTest {













                    Settings.Global.Wearable.CLOCKWORK_SYSUI_PACKAGE,















                    Settings.Global.Wearable.CLOCKWORK_SYSUI_MAIN_ACTIVITY,















                    Settings.Global.Wearable.CLOCKWORK_LONG_PRESS_TO_ASSISTANT_ENABLED,













                    Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER);













                    Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER,













                    Settings.Global.Wearable.WET_MODE_ON);































    private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =















             newHashSet(