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

Commit c7ba6daa authored by Yanli Wan's avatar Yanli Wan Committed by Automerger Merge Worker
Browse files

Merge "Update the string of Settings preference for device lock" into udc-dev... 

Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc36256 am: f120e3d5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457



Change-Id: I892da352fea5f362892c14b61e61a3b90a7ff4dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f2e08c31 f120e3d5

res/values/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -10178,8 +10178,7 @@ 
    <!-- Label explaining that the app installed by credit provider can be uninstalled. [CHAR LIMIT=60]-->

    <string name="financed_privacy_uninstall_creditor_app">You can uninstall the creditor app</string>

    <!-- Title of setting on security settings screen on a device provisioned by Device Lock. This will take the user to a screen in Device Lock with information about what a device provider can control and their impact on the user's privacy. Shown on Device Lock provisioned devices only. [CHAR LIMIT=NONE] -->

    <!-- TODO(b/282040794): Update the title -->

    <string name="device_lock_info">Device Lock</string>

    <string name="financed_device_info">Financed device info</string>

    <!-- Strings for displaying which applications were set as default for specific actions. -->

    <!-- Title for the apps that have been set as default handlers of camera-related intents. [CHAR LIMIT=30] -->

    <string name="default_camera_app_title">{count, plural,

res/xml/more_security_privacy_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ 
            settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/>



        <Preference

            android:key="device_lock_info"

            android:title="@string/device_lock_info"

            android:key="financed_device_info"

            android:title="@string/financed_device_info"

            android:summary="@string/summary_placeholder"

            settings:controller="com.android.settings.devicelock.DeviceLockPreferenceController">

            <intent android:action="com.android.devicelockcontroller.action.DEVICE_INFO_SETTINGS"/>

res/xml/security_advanced_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ 
            settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/>



        <Preference

            android:key="device_lock_info"

            android:title="@string/device_lock_info"

            android:key="financed_device_info"

            android:title="@string/financed_device_info"

            android:summary="@string/summary_placeholder"

            settings:controller="com.android.settings.devicelock.DeviceLockPreferenceController">

            <intent android:action="com.android.devicelockcontroller.action.DEVICE_INFO_SETTINGS"/>