Merge "Add temp flag for lockscreen/aod ui prototyping"

core/java/android/provider/Settings.java

@@ -14535,6 +14535,15 @@ public final class Settings {
          */
         public static final String SHOW_PEOPLE_SPACE = "show_people_space";
 
+        /**
+         * Whether to show new lockscreen & AOD UI.
+         * Values are:
+         * 0: Disabled (default)
+         * 1: Enabled
+         * @hide
+         */
+        public static final String SHOW_NEW_LOCKSCREEN = "show_new_lockscreen";
+
         /**
          * Block untrusted touches mode.
          *

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

@@ -440,6 +440,7 @@ public class SettingsBackupTest {
                     Settings.Global.SHOW_NEW_APP_INSTALLED_NOTIFICATION_ENABLED,
                     Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS,
                     Settings.Global.SHOW_PEOPLE_SPACE,
+                    Settings.Global.SHOW_NEW_LOCKSCREEN,
                     Settings.Global.SHOW_RESTART_IN_CRASH_DIALOG,
                     Settings.Global.SHOW_TEMPERATURE_WARNING,
                     Settings.Global.SHOW_USB_TEMPERATURE_ALARM,