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

Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d

Browse Source 
Change-Id: I3700b532220fe0a3e421b58a260bd66740e36220
This commit is contained in:
TreeHugger Robot
2020-04-30 16:26:33 +00:00
committed by Automerger Merge Worker
parent 734a147598 631944fe1d
commit 45775e72b4
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -7568,6 +7568,8 @@
<string name="keywords_color_mode">vibrant, RGB, sRGB, color, natural, standard</string> <string name="keywords_color_mode">vibrant, RGB, sRGB, color, natural, standard</string>
<string name="keywords_color_temperature">color, temperature, D65, D73, white, yellow, blue, warm, cool</string> <string name="keywords_color_temperature">color, temperature, D65, D73, white, yellow, blue, warm, cool</string>
<string name="keywords_lockscreen">slide to unlock, password, pattern, PIN</string> <string name="keywords_lockscreen">slide to unlock, password, pattern, PIN</string>
<!-- Search keyword for App pinning Settings [CHAR LIMIT=NONE] -->
<string name="keywords_app_pinning">screen pinning</string>
<string name="keywords_profile_challenge">work challenge, work, profile</string> <string name="keywords_profile_challenge">work challenge, work, profile</string>
<string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string> <string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>
<string name="keywords_gesture">gestures</string> <string name="keywords_gesture">gestures</string>

3
res/xml/security_dashboard_settings.xml
View File

@@ -145,7 +145,8 @@
android:key="screen_pinning_settings" android:key="screen_pinning_settings"
android:title="@string/screen_pinning_title" android:title="@string/screen_pinning_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.security.ScreenPinningSettings" /> android:fragment="com.android.settings.security.ScreenPinningSettings"
settings:keywords="@string/keywords_app_pinning" />
<SwitchPreference <SwitchPreference
android:order="90" android:order="90"