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

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

Merge changes from topic "expose_slices" 

* changes:
  Make some display related slices public.
  Make all TogglePreferenceController slice-able.
parents 304957b1 31719321

src/com/android/settings/core/TogglePreferenceController.java

+9 −0
Original line number Diff line number Diff line
@@ -70,4 +70,13 @@ public abstract class TogglePreferenceController extends BasePreferenceControlle 
        return SliceData.SliceType.SWITCH;

    }



    @Override

    public boolean isSliceable() {

        return true;

    }



    @Override

    public boolean isPublicSlice() {

        return false;

    }

}
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public class AdaptiveSleepDetailPreferenceController extends AdaptiveSleepPrefer 
    }



    @Override

    public boolean isSliceable() {

    public boolean isPublicSlice() {

        return true;

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,11 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference 
        return TextUtils.equals(getPreferenceKey(), "ambient_display_always_on");

    }



    @Override

    public boolean isPublicSlice() {

        return true;

    }



    @Override

    public boolean isChecked() {

        return getConfig().alwaysOnEnabled(MY_USER);

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

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ public class AmbientDisplayNotificationsPreferenceController extends 
        return TextUtils.equals(getPreferenceKey(), "ambient_display_notification");

    }



    @Override

    public boolean isPublicSlice() {

        return true;

    }



    private AmbientDisplayConfiguration getAmbientConfig() {

        if (mConfig == null) {

            mConfig = new AmbientDisplayConfiguration(mContext);

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ public class AutoBrightnessDetailPreferenceController extends AutoBrightnessPref 
    }



    @Override

    public boolean isSliceable() {

    public boolean isPublicSlice() {

        return true;

    }

}