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

Commit 78243834 authored by Edgar Wang's avatar Edgar Wang
Browse files

Revert "Unable to select twilight scheduling after enabling location" 

This reverts commit 9073b2f9.
Bug: 153115261
Reason for revert: this CL make Settings robolectric test fail at com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest

Change-Id: I3f1ba35f55f2905b10ca97149268be6074780eda
parent 9073b2f9

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

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class NightDisplayAutoModePreferenceController extends BasePreferenceCont 
        if (String.valueOf(ColorDisplayManager.AUTO_MODE_TWILIGHT).equals(newValue)

                && !mLocationManager.isLocationEnabled()) {

            TwilightLocationDialog.show(mContext);

            return true;

            return false;

        }

        return mColorDisplayManager.setNightDisplayAutoMode(Integer.parseInt((String) newValue));

    }

src/com/android/settings/display/darkmode/DarkModeScheduleSelectorController.java

+8 −8
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import com.android.settings.display.TwilightLocationDialog; 
 */

public class DarkModeScheduleSelectorController extends BasePreferenceController

        implements Preference.OnPreferenceChangeListener {

    private static final String TAG = DarkModeScheduleSelectorController.class.getSimpleName();



    private final UiModeManager mUiModeManager;

    private PowerManager mPowerManager;

    private DropDownPreference mPreference;
@@ -51,6 +51,7 @@ public class DarkModeScheduleSelectorController extends BasePreferenceController 
    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreference = screen.findPreference(getPreferenceKey());

        init();

    }



    @Override
@@ -58,8 +59,7 @@ public class DarkModeScheduleSelectorController extends BasePreferenceController 
        return BasePreferenceController.AVAILABLE;

    }



    @Override

    public final void updateState(Preference preference) {

    private void init() {

        final boolean batterySaver = mPowerManager.isPowerSaveMode();

        mPreference.setEnabled(!batterySaver);

        mCurrentMode = getCurrentMode();
@@ -87,25 +87,25 @@ public class DarkModeScheduleSelectorController extends BasePreferenceController 
        if (newMode == mCurrentMode) {

            return false;

        }

        if (newMode == mPreference.findIndexOfValue(

        mCurrentMode = newMode;

        if (mCurrentMode == mPreference.findIndexOfValue(

                mContext.getString(R.string.dark_ui_auto_mode_never))) {

            boolean active = (mContext.getResources().getConfiguration().uiMode

                    & Configuration.UI_MODE_NIGHT_YES) != 0;

            int mode = active ? UiModeManager.MODE_NIGHT_YES

                    : UiModeManager.MODE_NIGHT_NO;

            mUiModeManager.setNightMode(mode);

        } else if (newMode == mPreference.findIndexOfValue(

        } else if (mCurrentMode == mPreference.findIndexOfValue(

                mContext.getString(R.string.dark_ui_auto_mode_auto))) {

            if (!mLocationManager.isLocationEnabled()) {

                TwilightLocationDialog.show(mContext);

                return true;

                return false;

            }

            mUiModeManager.setNightMode(UiModeManager.MODE_NIGHT_AUTO);

        } else if (newMode == mPreference.findIndexOfValue(

        } else if (mCurrentMode == mPreference.findIndexOfValue(

                mContext.getString(R.string.dark_ui_auto_mode_custom))) {

            mUiModeManager.setNightMode(UiModeManager.MODE_NIGHT_CUSTOM);

        }

        mCurrentMode = newMode;

        return true;

    }

}