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

Commit 7fe11950 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge changes If145323c,I3aa3fcdc 

* changes:
  Track rotation and original frame in sizecompat
  Launch SizeCompat Activities in a Window on Freeform Desktop Mode
parents 74527563 72f084df

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -8809,6 +8809,13 @@ public final class Settings { 
        public static final String DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS =

                "force_desktop_mode_on_external_displays";













        /**













         * Whether to allow non-resizable apps to be freeform.













         * @hide













         */













        public static final String DEVELOPMENT_ENABLE_SIZECOMPAT_FREEFORM =













                "enable_sizecompat_freeform";



























       /**















        * Whether user has enabled development settings.















        */

































core/proto/android/providers/settings/global.proto



+1
−0




























Original line number
Diff line number
Diff line








@@ -281,6 +281,7 @@ message GlobalSettingsProto {













        optional SettingProto force_rtl = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto emulate_display_cutout = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto force_desktop_mode_on_external_displays = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto enable_sizecompat_freeform = 7 [ (android.privacy).dest = DEST_AUTOMATIC ];















    }















    optional Development development = 39;

















































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -548,6 +548,9 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS,















                GlobalSettingsProto.Development.FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS);













        dumpSetting(s, p,













                Settings.Global.DEVELOPMENT_ENABLE_SIZECOMPAT_FREEFORM,













                GlobalSettingsProto.Development.ENABLE_SIZECOMPAT_FREEFORM);















        p.end(developmentToken);































        final long deviceToken = p.start(GlobalSettingsProto.DEVICE);

































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



+1
−0




























Original line number
Diff line number
Diff line








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













                    Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS,















                    Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,















                    Settings.Global.DEVELOPMENT_FORCE_RTL,













                    Settings.Global.DEVELOPMENT_ENABLE_SIZECOMPAT_FREEFORM,















                    Settings.Global.DEVELOPMENT_SETTINGS_ENABLED,















                    Settings.Global.DEVICE_DEMO_MODE,















                    Settings.Global.DEVICE_IDLE_CONSTANTS,

































services/core/java/com/android/server/wm/ActivityRecord.java



+176
−149


























File changed.
Preview size limit exceeded, changes collapsed.