From 3e9e90aa9270194cfe15d41a23d32bbafae7a037 Mon Sep 17 00:00:00 2001
From: Yanting Yang <yantingyang@google.com>
Date: Fri, 5 Feb 2021 23:31:02 +0800
Subject: [PATCH] Apply FooterPreference to the sub-pages of Special app access

Affected pages:
- Display over other apps
- Modify system settings
- Picture-in-picture
- Install unknown apps
- Usage access
- Wi-Fi control

Bug: 179234542
Test: robotests & visual
Change-Id: Icac09d0cf2b92cb5b74a8c5629e211108a78cdb0
---
 res/xml/app_ops_permissions_details.xml                       | 2 +-
 res/xml/change_wifi_state_details.xml                         | 4 ++--
 res/xml/draw_overlay_permissions_details.xml                  | 4 ++--
 res/xml/external_sources_details.xml                          | 4 ++--
 res/xml/picture_in_picture_permissions_details.xml            | 4 ++--
 res/xml/write_system_settings_permissions_details.xml         | 4 ++--
 src/com/android/settings/applications/UsageAccessDetails.java | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/xml/app_ops_permissions_details.xml b/res/xml/app_ops_permissions_details.xml
index cbf3e127fdc..eb8188bad6b 100644
--- a/res/xml/app_ops_permissions_details.xml
+++ b/res/xml/app_ops_permissions_details.xml
@@ -20,7 +20,7 @@
     <com.android.settings.widget.FilterTouchesSwitchPreference
         android:key="app_ops_settings_switch" />
 
-    <Preference
+    <com.android.settingslib.widget.FooterPreference
         android:key="app_ops_settings_description"
         android:selectable="false" />
 
diff --git a/res/xml/change_wifi_state_details.xml b/res/xml/change_wifi_state_details.xml
index e3b67557d9c..e0aa6dfc440 100644
--- a/res/xml/change_wifi_state_details.xml
+++ b/res/xml/change_wifi_state_details.xml
@@ -22,9 +22,9 @@
       android:key="app_ops_settings_switch"
       android:title="@string/change_wifi_state_app_detail_switch"/>
 
-  <Preference
+  <com.android.settingslib.widget.FooterPreference
       android:key="app_ops_settings_preference"
-      android:summary="@string/change_wifi_state_app_detail_summary"
+      android:title="@string/change_wifi_state_app_detail_summary"
       android:selectable="false"/>
 
 </PreferenceScreen>
diff --git a/res/xml/draw_overlay_permissions_details.xml b/res/xml/draw_overlay_permissions_details.xml
index d3397a707b7..603d540fa9e 100644
--- a/res/xml/draw_overlay_permissions_details.xml
+++ b/res/xml/draw_overlay_permissions_details.xml
@@ -22,8 +22,8 @@
         android:key="app_ops_settings_switch"
         android:title="@string/permit_draw_overlay"/>
 
-    <Preference
-        android:summary="@string/allow_overlay_description"
+    <com.android.settingslib.widget.FooterPreference
+        android:title="@string/allow_overlay_description"
         android:selectable="false"/>
 
 </PreferenceScreen>
diff --git a/res/xml/external_sources_details.xml b/res/xml/external_sources_details.xml
index 57d5587c69f..7b67871a914 100644
--- a/res/xml/external_sources_details.xml
+++ b/res/xml/external_sources_details.xml
@@ -21,9 +21,9 @@
         android:key="external_sources_settings_switch"
         android:title="@string/external_source_switch_title" />
 
-    <Preference
+    <com.android.settingslib.widget.FooterPreference
         android:key="external_sources_settings_description"
-        android:summary="@string/install_all_warning"
+        android:title="@string/install_all_warning"
         android:selectable="false" />
 
 </PreferenceScreen>
diff --git a/res/xml/picture_in_picture_permissions_details.xml b/res/xml/picture_in_picture_permissions_details.xml
index 5f2a45ae55c..ba23e2abf22 100644
--- a/res/xml/picture_in_picture_permissions_details.xml
+++ b/res/xml/picture_in_picture_permissions_details.xml
@@ -22,8 +22,8 @@
         android:key="app_ops_settings_switch"
         android:title="@string/picture_in_picture_app_detail_switch"/>
 
-    <Preference
-        android:summary="@string/picture_in_picture_app_detail_summary"
+    <com.android.settingslib.widget.FooterPreference
+        android:title="@string/picture_in_picture_app_detail_summary"
         android:selectable="false"/>
 
 </PreferenceScreen>
diff --git a/res/xml/write_system_settings_permissions_details.xml b/res/xml/write_system_settings_permissions_details.xml
index 21ea7065e1b..a2f9cbd8f6c 100644
--- a/res/xml/write_system_settings_permissions_details.xml
+++ b/res/xml/write_system_settings_permissions_details.xml
@@ -22,8 +22,8 @@
         android:key="app_ops_settings_switch"
         android:title="@string/permit_write_settings"/>
 
-    <Preference
-        android:summary="@string/write_settings_description"
+    <com.android.settingslib.widget.FooterPreference
+        android:title="@string/write_settings_description"
         android:selectable="false"/>
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java
index cddacb3b280..4681fd8238a 100644
--- a/src/com/android/settings/applications/UsageAccessDetails.java
+++ b/src/com/android/settings/applications/UsageAccessDetails.java
@@ -74,7 +74,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
 
         getPreferenceScreen().setTitle(R.string.usage_access);
         mSwitchPref.setTitle(R.string.permit_usage_access);
-        mUsageDesc.setSummary(R.string.usage_access_description);
+        mUsageDesc.setTitle(R.string.usage_access_description);
 
         mSwitchPref.setOnPreferenceChangeListener(this);