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

Commit 7a2dfd34 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Support toggling resumption in Settings am: c1bc307b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817534

Change-Id: Ie0520c407c27112a05049ef6627528e204ffdff2
parents dd183df4 c1bc307b

core/java/android/provider/Settings.java

+18 −0
Original line number Diff line number Diff line
@@ -1897,6 +1897,15 @@ public final class Settings { 
    public static final String ACTION_DEVICE_CONTROLS_SETTINGS =

            "android.settings.ACTION_DEVICE_CONTROLS_SETTINGS";













    /**













     * Activity Action: Show media control settings













     *













     * @hide













     */













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_MEDIA_CONTROLS_SETTINGS =













            "android.settings.ACTION_MEDIA_CONTROLS_SETTINGS";



























    /**















     * Activity Action: Show a dialog with disabled by policy message.















     * <p> If an user action is disabled by policy, this dialog can be triggered to let










@@ -8910,6 +8919,15 @@ public final class Settings {













         */















        public static final String PEOPLE_STRIP = "people_strip";



























        /**













         * Whether or not to enable media resumption













         * When enabled, media controls in quick settings will populate on boot and persist if













         * resumable via a MediaBrowserService.













         * @see Settings.Global#SHOW_MEDIA_ON_QUICK_SETTINGS













         * @hide













         */













        public static final String MEDIA_CONTROLS_RESUME = "qs_media_resumption";



























        /**















         * Controls if window magnification is enabled.















         * @hide

































core/proto/android/app/settings_enums.proto



+5
−0




























Original line number
Diff line number
Diff line








@@ -2678,4 +2678,9 @@ enum PageId {













    // CATEGORY: SETTINGS















    // OS: R















    DEVICE_CONTROLS_SETTINGS = 1844;



























    // OPEN: Settings > Sound > Media













    // CATEGORY: SETTINGS













    // OS: R













    MEDIA_CONTROLS_SETTINGS = 1845;















}
























packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -164,7 +164,8 @@ public class SecureSettings {













        Settings.Secure.AWARE_TAP_PAUSE_GESTURE_COUNT,















        Settings.Secure.AWARE_TAP_PAUSE_TOUCH_COUNT,















        Settings.Secure.PEOPLE_STRIP,













        Settings.Secure.MEDIA_CONTROLS_RESUME,















        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,













        Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,













        Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS















    };















}
























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



+1
−0




























Original line number
Diff line number
Diff line








@@ -243,6 +243,7 @@ public class SecureSettingsValidators {













        VALIDATORS.put(Secure.DISPLAY_DENSITY_FORCED, NON_NEGATIVE_INTEGER_VALIDATOR);















        VALIDATORS.put(Secure.TAP_GESTURE, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.PEOPLE_STRIP, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.MEDIA_CONTROLS_RESUME, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_MODE,















                new InclusiveIntegerRangeValidator(















                        Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,

































packages/SystemUI/res/values/strings.xml



+8
−2




























Original line number
Diff line number
Diff line








@@ -2784,10 +2784,16 @@













         recommended controls [CHAR_LIMIT=60] -->















    <string name="controls_seeding_in_progress">Loading recommendations</string>





























    <!-- Close the controls associated with a specific media session [CHAR_LIMIT=NONE] -->













    <string name="controls_media_close_session">Close this media session</string>













    <!-- Title for media controls [CHAR_LIMIT=50] -->













    <string name="controls_media_title">Media</string>













    <!-- Explanation for closing controls associated with a specific media session [CHAR_LIMIT=NONE] -->













    <string name="controls_media_close_session">Hide the current session.</string>













    <!-- Label for a button that will hide media controls [CHAR_LIMIT=30] -->













    <string name="controls_media_dismiss_button">Hide</string>















    <!-- Label for button to resume media playback [CHAR_LIMIT=NONE] -->















    <string name="controls_media_resume">Resume</string>













    <!-- Label for button to go to media control settings screen [CHAR_LIMIT=30] -->













    <string name="controls_media_settings_button">Settings</string>































    <!-- Error message indicating that a control timed out while waiting for an update [CHAR_LIMIT=30] -->















    <string name="controls_error_timeout">Inactive, check app</string>