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

Commit ca445ed0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect switch status when user stay in NightDisplaySettings page... 

Merge "Fix incorrect switch status when user stay in NightDisplaySettings page while scheduled night lights on" into main am: cdca9397

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181238



Change-Id: I8c3f7ba8b5a1e237148a6532d53d2b519ef1862f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0decf6e7 cdca9397

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

+0 −15
Original line number Diff line number Diff line
@@ -90,11 +90,6 @@ public class NightDisplayActivationPreferenceController extends 
        }

    }



    @Override

    public final void updateState(Preference preference) {

        updateStateInternal();

    }



    /** FOR SLICES */



    @Override
@@ -112,14 +107,4 @@ public class NightDisplayActivationPreferenceController extends 
        return mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager);

    }



    private void updateStateInternal() {

        final boolean isActivated = mColorDisplayManager.isNightDisplayActivated();

        final int autoMode = mColorDisplayManager.getNightDisplayAutoMode();



        if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) {

            mTimeFormatter.getFormattedTimeString(isActivated

                    ? mColorDisplayManager.getNightDisplayCustomStartTime()

                    : mColorDisplayManager.getNightDisplayCustomEndTime());

        }

    }

}