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

Commit 7f786f5e authored by Ats Jenk's avatar Ats Jenk Committed by Automerger Merge Worker
Browse files

Merge "Core changes to support desktop mode option" into tm-qpr-dev am: 86b968c0 

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



Change-Id: Ic5ba63af426fc20349761b01bc6860edd2c76bb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9793644 86b968c0

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -5481,6 +5481,15 @@ public final class Settings { 
        @Readable

        public static final String MULTI_AUDIO_FOCUS_ENABLED = "multi_audio_focus_enabled";













        /**













         * Whether desktop mode is enabled or not.













         * 0 = off













         * 1 = on













         * @hide













         */













        @Readable













        public static final String DESKTOP_MODE = "desktop_mode";



























        /**















         * IMPORTANT: If you add a new public settings you also have to add it to















         * PUBLIC_SETTINGS below. If the new setting is hidden you have to add










@@ -5610,6 +5619,7 @@ public final class Settings {













            PRIVATE_SETTINGS.add(SHOW_BATTERY_PERCENT);















            PRIVATE_SETTINGS.add(DISPLAY_COLOR_MODE);















            PRIVATE_SETTINGS.add(DISPLAY_COLOR_MODE_VENDOR_HINT);













            PRIVATE_SETTINGS.add(DESKTOP_MODE);















        }





























        /**

































packages/SettingsLib/res/values/strings.xml



+3
−0




























Original line number
Diff line number
Diff line








@@ -962,6 +962,9 @@













    <!-- UI debug setting: enable freeform window support summary [CHAR LIMIT=150] -->















    <string name="enable_freeform_support_summary">Enable support for experimental freeform windows.</string>





























    <!-- UI debug setting: enable desktop mode [CHAR LIMIT=25] -->













    <string name="desktop_mode">Desktop mode</string>





























    <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->















    <string name="local_backup_password_title">Desktop backup password</string>















    <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -98,6 +98,7 @@ public class SettingsBackupTest {













                    Settings.System.VOLUME_VOICE, // deprecated since API 2?















                    Settings.System.WHEN_TO_MAKE_WIFI_CALLS, // bug?















                    Settings.System.WINDOW_ORIENTATION_LISTENER_LOG, // used for debugging only













                    Settings.System.DESKTOP_MODE, // developer setting for internal prototyping















                    Settings.System.MIN_REFRESH_RATE, // depends on hardware capabilities















                    Settings.System.PEAK_REFRESH_RATE, // depends on hardware capabilities















                    Settings.System.SCREEN_BRIGHTNESS_FLOAT,