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

Commit 379c317a authored by Christine Franks's avatar Christine Franks Committed by android-build-merger
Browse files

Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev 

am: 484115b7

Change-Id: Id9f50aeab430db43e9f18bcdfd80b6dcac2c43a7
parents 8cba74a6 484115b7

core/java/android/provider/Settings.java

+0 −16
Original line number Original line Diff line number Diff line
@@ -10079,22 +10079,6 @@ public final class Settings { 
         */

         */

        public static final String DEVICE_DEMO_MODE = "device_demo_mode";

        public static final String DEVICE_DEMO_MODE = "device_demo_mode";





        /**

         * Retail mode specific settings. This is encoded as a key=value list, separated by commas.

         * Ex: "user_inactivity_timeout_ms=30000,warning_dialog_timeout_ms=10000". The following

         * keys are supported:

         *

         * <pre>

         * user_inactivity_timeout_ms  (long)

         * warning_dialog_timeout_ms   (long)

         * </pre>

         * <p>

         * Type: string

         *

         * @hide

         */

        public static final String RETAIL_DEMO_MODE_CONSTANTS = "retail_demo_mode_constants";



        /**

        /**

         * Indicates the maximum time that an app is blocked for the network rules to get updated.

         * Indicates the maximum time that an app is blocked for the network rules to get updated.

         *

         *

core/proto/android/providers/settings.proto

+0 −1
Original line number Original line Diff line number Diff line
@@ -315,7 +315,6 @@ message GlobalSettingsProto { 
    SettingProto boot_count = 270;

    SettingProto boot_count = 270;

    SettingProto safe_boot_disallowed = 271;

    SettingProto safe_boot_disallowed = 271;

    SettingProto device_demo_mode = 272;

    SettingProto device_demo_mode = 272;

    SettingProto retail_demo_mode_constants = 273;

    SettingProto database_downgrade_reason = 274;

    SettingProto database_downgrade_reason = 274;

    SettingProto contacts_database_wal_enabled = 275;

    SettingProto contacts_database_wal_enabled = 275;

    SettingProto multi_sim_voice_call_subscription = 276;

    SettingProto multi_sim_voice_call_subscription = 276;

core/res/res/values/strings.xml

+0 −12
Original line number Original line Diff line number Diff line
@@ -4590,22 +4590,10 @@ 
    <!-- The representation of a time duration when negative. An example is -1:14. This can be used with a countdown timer for example.-->

    <!-- The representation of a time duration when negative. An example is -1:14. This can be used with a countdown timer for example.-->

    <string name="negative_duration">\u2212<xliff:g id="time" example="1:14">%1$s</xliff:g></string>

    <string name="negative_duration">\u2212<xliff:g id="time" example="1:14">%1$s</xliff:g></string>





    <!-- Title of notification to start a new demo session when device is in retail mode [CHAR LIMIT=NONE] -->

    <string name="reset_retail_demo_mode_title">Reset device?</string>

    <!-- Text of notification to start a new demo session when device is in retail mode [CHAR LIMIT=NONE] -->

    <string name="reset_retail_demo_mode_text">Tap to reset device</string>

    <!-- Text of dialog shown when starting a demo user for the first time [CHAR LIMIT=40] -->

    <!-- Text of dialog shown when starting a demo user for the first time [CHAR LIMIT=40] -->

    <string name="demo_starting_message">Starting demo\u2026</string>

    <string name="demo_starting_message">Starting demo\u2026</string>

    <!-- Text of dialog shown when starting a new demo user in retail demo mode [CHAR LIMIT=40] -->

    <!-- Text of dialog shown when starting a new demo user in retail demo mode [CHAR LIMIT=40] -->

    <string name="demo_restarting_message">Resetting device\u2026</string>

    <string name="demo_restarting_message">Resetting device\u2026</string>

    <!-- Title of the dialog shown when user inactivity times out in retail demo mode [CHAR LIMIT=40] -->

    <string name="demo_user_inactivity_timeout_title">Reset device?</string>

    <!-- Warning message shown when user inactivity times out in retail demo mode [CHAR LIMIT=none] -->

    <string name="demo_user_inactivity_timeout_countdown">You\u2019ll lose any changes and the demo will start again in <xliff:g id="timeout" example="9">%1$s</xliff:g> seconds\u2026</string>

    <!-- Text of button to allow user to abort countdown and continue current session in retail demo mode [CHAR LIMIT=40] -->

    <string name="demo_user_inactivity_timeout_left_button">Cancel</string>

    <!-- Text of button to allow user to abort countdown and immediately start another session in retail demo mode [CHAR LIMIT=40] -->

    <string name="demo_user_inactivity_timeout_right_button">Reset now</string>





    <!-- Accessibilty string added to a widget that has been suspended [CHAR LIMIT=20] -->

    <!-- Accessibilty string added to a widget that has been suspended [CHAR LIMIT=20] -->

    <string name="suspended_widget_accessibility">Disabled <xliff:g id="label" example="Calendar">%1$s</xliff:g></string>

    <string name="suspended_widget_accessibility">Disabled <xliff:g id="label" example="Calendar">%1$s</xliff:g></string>

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -298,7 +298,6 @@ public class SettingsBackupTest { 
                    Settings.Global.RECOMMENDED_NETWORK_EVALUATOR_CACHE_EXPIRY_MS,

                    Settings.Global.RECOMMENDED_NETWORK_EVALUATOR_CACHE_EXPIRY_MS,

                    Settings.Global.READ_EXTERNAL_STORAGE_ENFORCED_DEFAULT,

                    Settings.Global.READ_EXTERNAL_STORAGE_ENFORCED_DEFAULT,

                    Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT,

                    Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT,

                    Settings.Global.RETAIL_DEMO_MODE_CONSTANTS,

                    Settings.Global.SAFE_BOOT_DISALLOWED,

                    Settings.Global.SAFE_BOOT_DISALLOWED,

                    Settings.Global.SAMPLING_PROFILER_MS,

                    Settings.Global.SAMPLING_PROFILER_MS,

                    Settings.Global.SELINUX_STATUS,

                    Settings.Global.SELINUX_STATUS,

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -914,9 +914,6 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

        dumpSetting(s, p,

                Settings.Global.DEVICE_DEMO_MODE,

                Settings.Global.DEVICE_DEMO_MODE,

                GlobalSettingsProto.DEVICE_DEMO_MODE);

                GlobalSettingsProto.DEVICE_DEMO_MODE);

        dumpSetting(s, p,

                Settings.Global.RETAIL_DEMO_MODE_CONSTANTS,

                GlobalSettingsProto.RETAIL_DEMO_MODE_CONSTANTS);

        dumpSetting(s, p,

        dumpSetting(s, p,

                Settings.Global.DATABASE_DOWNGRADE_REASON,

                Settings.Global.DATABASE_DOWNGRADE_REASON,

                GlobalSettingsProto.DATABASE_DOWNGRADE_REASON);

                GlobalSettingsProto.DATABASE_DOWNGRADE_REASON);