Merge "Apply FooterPreference to the sub-pages of Special app access" into sc-dev
diff --git a/res/xml/app_ops_permissions_details.xml b/res/xml/app_ops_permissions_details.xml
index cbf3e12..eb8188b 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 e3b6755..e0aa6df 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 d3397a7..603d540 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 57d5587..7b67871 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 5f2a45a..ba23e2a 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 21ea706..a2f9cbd 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 cddacb3..4681fd8 100644
--- a/src/com/android/settings/applications/UsageAccessDetails.java
+++ b/src/com/android/settings/applications/UsageAccessDetails.java
@@ -74,7 +74,7 @@
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);