PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Follow footer preference guildance on some pages" into sc-dev am: 0dae5d005f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13989773

Change-Id: I837ce2bcd0f79627e43f74c1bc0edd4f48882adf
This commit is contained in:
Tsung-Mao Fang
2021-03-29 09:42:57 +00:00
committed by Automerger Merge Worker
parent 355dd6caf4 0dae5d005f
commit 4ebe8776e6
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -6617,7 +6617,7 @@
<!-- Message displayed to let the user know that some of the options are disabled by admin. [CHAR LIMIT=NONE] -->
<string name="admin_disabled_other_options">Other options are disabled by your admin</string>
<string name="admin_more_details">More details</string>
<string name="admin_more_details">Learn more</string>
<string name="notification_log_title">Notification log</string>
<string name="notification_history_title">Notification history</string>

6
res/xml/tether_prefs.xml
View File

@@ -49,9 +49,9 @@
android:summary="@string/ethernet_tethering_subtext"
settings:keywords="@string/keywords_hotspot_tethering" />
<Preference
<com.android.settingslib.widget.FooterPreference
android:key="disabled_on_data_saver"
android:summary="@string/tether_settings_disabled_on_data_saver"
android:title="@string/tether_settings_disabled_on_data_saver"
android:selectable="false"
settings:allowDividerAbove="true" />
settings:searchable="false"/>
</PreferenceScreen>