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

[Ambient Lite] Add a WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS setting.

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

Bug: 177914227
Test: manual test
Change-Id: Ie2751e007a57faba6ae83c48fc494ff80d2dc912
(cherry picked from commit c92d2c67591467541dec962f75a11560a142ef44)
This commit is contained in:
Josh Yang
2021-04-28 17:02:15 -07:00
committed by Yeabkal Assegid Wubshit
parent b95a0f20dc
commit 936413580d
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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";
}
}

4
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

@@ -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);
}
}

3
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -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(