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

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

Merge "Remove On/Off string from Night light slice" into qt-dev

parents 7cc1469b 7d0150d1

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

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class NightDisplayActivationPreferenceController extends TogglePreference 


    @Override

    public CharSequence getSummary() {

        return mTimeFormatter.getAutoModeTimeSummary(mContext, mColorDisplayManager);

        return mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager);

    }



    private void updateStateInternal() {

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class NightDisplayTimeFormatter { 
        return context.getString(summaryFormatResId, getAutoModeSummary(context, manager));

    }



    private String getAutoModeSummary(Context context, ColorDisplayManager manager) {

    public String getAutoModeSummary(Context context, ColorDisplayManager manager) {

        final boolean isActivated = manager.isNightDisplayActivated();

        final int autoMode = manager.getNightDisplayAutoMode();

        if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) {