Merge "Apply FooterPreference to the sub-pages of Special app access" into sc-dev

This commit is contained in:
Yanting Yang
2021-02-08 13:25:57 +00:00
committed by Android (Google) Code Review
7 changed files with 12 additions and 12 deletions

View File

@@ -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" />

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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);