From ee4bbb2982e69d723c72c09c5cfca34c1224e4e8 Mon Sep 17 00:00:00 2001
From: Tsung-Mao Fang <tmfang@google.com>
Date: Tue, 17 Nov 2020 16:04:58 +0800
Subject: [PATCH] Apply top intro preference for app pinning feature

Test: See the screenshot
Bug: 173087905
Screenshot: https://screenshot.googleplex.com/Aogw7wAfXtsyiYQ
Change-Id: Ia4a37bccde3303bfa1ab3ac558bbe1b9f4162192
---
 res/values/strings.xml              | 8 ++++----
 res/xml/screen_pinning_settings.xml | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5691b3a05c9..e491793b86b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9409,10 +9409,11 @@
 
     <!-- [CHAR LIMIT=28] Screen pinning title -->
     <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 -->
     <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.
-        \n\nWhen an app is pinned, the pinned app may open other apps and personal data may be accessible.
+        When an app is pinned, the pinned app may open other apps and personal data may be accessible.
         \n\nTo use app pinning:
         \t\n1.\tTurn on app pinning
         \t\n2.\tOpen Overview
@@ -9420,8 +9421,7 @@
     </string>
     <!-- [CHAR LIMIT=none] Screen pinning 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.
-        \n\nWhen an app is pinned, the pinned app may open other apps and personal data may be accessible.
+        When 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\nTo use app pinning:
         \t\n1.\tTurn on app pinning
diff --git a/res/xml/screen_pinning_settings.xml b/res/xml/screen_pinning_settings.xml
index 04e537749a3..7689043c681 100644
--- a/res/xml/screen_pinning_settings.xml
+++ b/res/xml/screen_pinning_settings.xml
@@ -19,14 +19,18 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/screen_pinning_title">
 
+    <com.android.settingslib.widget.TopIntroPreference
+        android:title="@string/app_pinning_intro"
+        settings:searchable="false"/>
+
     <SwitchPreference
         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
         android:key="screen_pinning_settings_screen_footer"
         android:title="@string/screen_pinning_description"
-        android:selectable="false"
         settings:searchable="false" />
 
 </PreferenceScreen>