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

Commit 1bc2c833 authored by Marco Ballesio's avatar Marco Ballesio Committed by Automerger Merge Worker
Browse files

Merge changes from topic "developer option for app freezer" into rvc-dev am:... 

Merge changes from topic "developer option for app freezer" into rvc-dev am: ce9b4785 am: a4d2277a

Change-Id: Ib36b661fa86d8f8b1292c7936bc64f11db54aff6
parents aa60731a a4d2277a

packages/SettingsLib/res/values/arrays.xml

+14 −0
Original line number Diff line number Diff line
@@ -633,4 +633,18 @@ 
        <item>@color/bt_color_bg_7</item>

    </integer-array>



    <!-- Cached apps freezer modes -->

    <array name="cached_apps_freezer_entries">

        <item>@string/cached_apps_freezer_device_default</item>

        <item>@string/cached_apps_freezer_enabled</item>

        <item>@string/cached_apps_freezer_disabled</item>

    </array>



    <!-- Values for cached apps freezer modes -->

    <array name="cached_apps_freezer_values">

        <item>device_default</item>

        <item>enabled</item>

        <item>disabled</item>

    </array>



</resources>

packages/SettingsLib/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -1365,4 +1365,12 @@ 
    <!-- Name for the guest user [CHAR LIMIT=35] -->

    <string name="guest_nickname">Guest</string>



    <!-- List entry in developer settings to choose default device/system behavior for the app freezer [CHAR LIMIT=30]-->

    <string name="cached_apps_freezer_device_default">Device default</string>

    <!-- List entry in developer settings to disable the app freezer in developer settings [CHAR LIMIT=30]-->

    <string name="cached_apps_freezer_disabled">Disabled</string>

    <!-- List entry in developer settings to enable the app freezer in developer settings [CHAR LIMIT=30]-->

    <string name="cached_apps_freezer_enabled">Enabled</string>

    <!-- Developer setting dialog prompting the user to reboot after changing the app freezer setting [CHAR LIMIT=NONE]-->

    <string name="cached_apps_freezer_reboot_dialog_text">Your device must be rebooted for this change to apply. Reboot now or cancel.</string>

</resources>