Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Apply top intro preference for app pinning feature"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-11-24 16:17:07 +00:00
committed by Android (Google) Code Review
parent e5ee4152cb ee4bbb2982
commit 4a921534ef
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -9415,10 +9415,11 @@
<!-- [CHAR LIMIT=28] Screen pinning title --> <!-- [CHAR LIMIT=28] Screen pinning title -->
<string name="screen_pinning_title">App pinning</string> <string name="screen_pinning_title">App pinning</string>
<!-- [CHAR LIMIT=none] Screen pinning introduction -->
<string name="app_pinning_intro">App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game.</string>
<!-- [CHAR LIMIT=none] Screen pinning description --> <!-- [CHAR LIMIT=none] Screen pinning description -->
<string name="screen_pinning_description"> <string name="screen_pinning_description">
App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. When an app is pinned, the pinned app may open other apps and personal data may be accessible.
\n\nWhen an app is pinned, the pinned app may open other apps and personal data may be accessible.
\n\nTo use app pinning: \n\nTo use app pinning:
\t\n1.\tTurn on app pinning \t\n1.\tTurn on app pinning
\t\n2.\tOpen Overview \t\n2.\tOpen Overview
@@ -9426,8 +9427,7 @@
</string> </string>
<!-- [CHAR LIMIT=none] Screen pinning description --> <!-- [CHAR LIMIT=none] Screen pinning description -->
<string name="screen_pinning_guest_user_description"> <string name="screen_pinning_guest_user_description">
App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. When an app is pinned, the pinned app may open other apps and personal data may be accessible.
\n\nWhen an app is pinned, the pinned app may open other apps and personal data may be accessible.
\n\nIf you want to securely share your device with someone, try using a guest user instead. \n\nIf you want to securely share your device with someone, try using a guest user instead.
\n\nTo use app pinning: \n\nTo use app pinning:
\t\n1.\tTurn on app pinning \t\n1.\tTurn on app pinning

8
res/xml/screen_pinning_settings.xml
View File

@@ -19,14 +19,18 @@
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/screen_pinning_title"> android:title="@string/screen_pinning_title">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/app_pinning_intro"
settings:searchable="false"/>
<SwitchPreference <SwitchPreference
android:key="use_screen_lock" android:key="use_screen_lock"
android:title="@string/screen_pinning_unlock_none" /> android:title="@string/screen_pinning_unlock_none"
settings:allowDividerAbove="true"/>
<com.android.settingslib.widget.FooterPreference <com.android.settingslib.widget.FooterPreference
android:key="screen_pinning_settings_screen_footer" android:key="screen_pinning_settings_screen_footer"
android:title="@string/screen_pinning_description" android:title="@string/screen_pinning_description"
android:selectable="false"
settings:searchable="false" /> settings:searchable="false" />
</PreferenceScreen> </PreferenceScreen>