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

Merge "Use FooterPreference in xml explicitly"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-14 19:03:35 +00:00
committed by Android (Google) Code Review
parent 8b1e3029b1 a6c0bd5346
commit c61b43d043
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/tether_prefs.xml
View File

@@ -44,4 +44,10 @@
android:summary="@string/tether_settings_disabled_on_data_saver" android:summary="@string/tether_settings_disabled_on_data_saver"
android:selectable="false" android:selectable="false"
settings:allowDividerAbove="true" /> settings:allowDividerAbove="true" />
<com.android.settingslib.widget.FooterPreference
android:key="tether_prefs_footer"
android:title="@string/tethering_footer_info"
android:selectable="false"
settings:searchable="false"/>
</PreferenceScreen> </PreferenceScreen>

3
src/com/android/settings/TetherSettings.java
View File

@@ -120,9 +120,6 @@ public class TetherSettings extends RestrictedSettingsFragment
super.onCreate(icicle); super.onCreate(icicle);
addPreferencesFromResource(R.xml.tether_prefs); addPreferencesFromResource(R.xml.tether_prefs);
mFooterPreferenceMixin.createFooterPreference()
.setTitle(R.string.tethering_footer_info);
mDataSaverBackend = new DataSaverBackend(getContext()); mDataSaverBackend = new DataSaverBackend(getContext());
mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled(); mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled();
mDataSaverFooter = findPreference(KEY_DATA_SAVER_FOOTER); mDataSaverFooter = findPreference(KEY_DATA_SAVER_FOOTER);