PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iaf3158afffa27a9c8dac6862a1516019613852ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yanli Wan
2023-06-02 15:56:33 +00:00
committed by Automerger Merge Worker
parent aac695129e f120e3d563
commit d3516aa5d0
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -10187,8 +10187,7 @@
<!-- Label explaining that the app installed by credit provider can be uninstalled. [CHAR LIMIT=60]--> <!-- 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> <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] --> <!-- 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="financed_device_info">Financed device info</string>
<string name="device_lock_info">Device Lock</string>
<!-- Strings for displaying which applications were set as default for specific actions. --> <!-- 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] --> <!-- 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, <string name="default_camera_app_title">{count, plural,

4
res/xml/more_security_privacy_settings.xml
View File

@@ -147,8 +147,8 @@
settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/> settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/>
<Preference <Preference
android:key="device_lock_info" android:key="financed_device_info"
android:title="@string/device_lock_info" android:title="@string/financed_device_info"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.devicelock.DeviceLockPreferenceController"> settings:controller="com.android.settings.devicelock.DeviceLockPreferenceController">
<intent android:action="com.android.devicelockcontroller.action.DEVICE_INFO_SETTINGS"/> <intent android:action="com.android.devicelockcontroller.action.DEVICE_INFO_SETTINGS"/>

4
res/xml/security_advanced_settings.xml
View File

@@ -59,8 +59,8 @@
settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/> settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/>
<Preference <Preference
android:key="device_lock_info" android:key="financed_device_info"
android:title="@string/device_lock_info" android:title="@string/financed_device_info"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.devicelock.DeviceLockPreferenceController"> settings:controller="com.android.settings.devicelock.DeviceLockPreferenceController">
<intent android:action="com.android.devicelockcontroller.action.DEVICE_INFO_SETTINGS"/> <intent android:action="com.android.devicelockcontroller.action.DEVICE_INFO_SETTINGS"/>