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

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

Merge "Use FooterPreference in xml explicitly"

parents 20f0faee 343c39fa

res/xml/adaptive_sleep_detail.xml

+7 −0
Original line number Diff line number Diff line
@@ -45,4 +45,11 @@ 
        settings:useAdminDisabledSummary="true"

        settings:allowDividerAbove="true" />



    <com.android.settingslib.widget.FooterPreference

        android:key="adaptive_sleep_footer"

        android:title="@string/adaptive_sleep_privacy"

        android:icon="@drawable/ic_privacy_shield_24dp"

        android:selectable="false"

        settings:searchable="false" />



</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/display/AdaptiveSleepSettings.java

+0 −6
Original line number Diff line number Diff line
@@ -44,13 +44,7 @@ public class AdaptiveSleepSettings extends DashboardFragment { 
    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        final FooterPreference footerPreference =

                mFooterPreferenceMixin.createFooterPreference();

        mContext = getContext();



        footerPreference.setIcon(R.drawable.ic_privacy_shield_24dp);

        footerPreference.setTitle(R.string.adaptive_sleep_privacy);



        Preference permissionPreference = findPreference(

                AdaptiveSleepPermissionPreferenceController.PREF_NAME);

        if (permissionPreference != null) {