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

Commit 93641358 authored by Josh Yang's avatar Josh Yang Committed by Yeabkal Assegid Wubshit
Browse files

[Ambient Lite] Add a WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS setting. 

See go/sysui-aod-lite-expiration for more details.

Bug: 177914227
Test: manual test
Change-Id: Ie2751e007a57faba6ae83c48fc494ff80d2dc912
(cherry picked from commit c92d2c67591467541dec962f75a11560a142ef44)
parent b95a0f20

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -16757,6 +16757,13 @@ public final class Settings { 
             * @hide

             */

            public static final int BATTERY_SAVER_MODE_CUSTOM = 4;













            /**













             * The maximum ambient mode duration when an activity is allowed to auto resume.













             * @hide













             */













            public static final String WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS =













                    "wear_activity_auto_resume_timeout_ms";















        }















    }







































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



+4
−0




























Original line number
Diff line number
Diff line








@@ -20,6 +20,7 @@ import static android.media.AudioFormat.SURROUND_SOUND_ENCODING;













import static android.provider.settings.validators.SettingsValidators.ANY_INTEGER_VALIDATOR;















import static android.provider.settings.validators.SettingsValidators.ANY_STRING_VALIDATOR;















import static android.provider.settings.validators.SettingsValidators.BOOLEAN_VALIDATOR;













import static android.provider.settings.validators.SettingsValidators.NON_NEGATIVE_INTEGER_VALIDATOR;















import static android.provider.settings.validators.SettingsValidators.PACKAGE_NAME_VALIDATOR;















import static android.provider.settings.validators.SettingsValidators.PERCENTAGE_INTEGER_VALIDATOR;















import static android.view.Display.HdrCapabilities.HDR_TYPES;










@@ -306,6 +307,9 @@ public class GlobalSettingsValidators {













                                String.valueOf(Global.Wearable.BATTERY_SAVER_MODE_TIME_ONLY),















                                String.valueOf(Global.Wearable.BATTERY_SAVER_MODE_CUSTOM)















                        }));













        VALIDATORS.put(













                Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,













                NON_NEGATIVE_INTEGER_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.SETUP_LOCALE,















                    Settings.Global.Wearable.OEM_SETUP_VERSION,















                    Settings.Global.Wearable.MASTER_GESTURES_ENABLED,













                    Settings.Global.Wearable.UNGAZE_ENABLED);













                    Settings.Global.Wearable.UNGAZE_ENABLED,













                    Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS);































    private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =















             newHashSet(