Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c61b43d0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use FooterPreference in xml explicitly"

parents 8b1e3029 a6c0bd53

res/xml/tether_prefs.xml

+6 −0
Original line number Diff line number Diff line
@@ -44,4 +44,10 @@ 
        android:summary="@string/tether_settings_disabled_on_data_saver"

        android:selectable="false"

        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>

src/com/android/settings/TetherSettings.java

+0 −3
Original line number Diff line number Diff line
@@ -120,9 +120,6 @@ public class TetherSettings extends RestrictedSettingsFragment 
        super.onCreate(icicle);



        addPreferencesFromResource(R.xml.tether_prefs);

        mFooterPreferenceMixin.createFooterPreference()

            .setTitle(R.string.tethering_footer_info);



        mDataSaverBackend = new DataSaverBackend(getContext());

        mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled();

        mDataSaverFooter = findPreference(KEY_DATA_SAVER_FOOTER);