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

Commit a7ea18a6 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Move NightMode to Display settings 

Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DarkUIPreferenceController
Bug: 110758454
Change-Id: Ie389a0e55eb39f2b43d4e9c0739ad3f61469d740
parent c74969e7

res/xml/development_settings.xml

+0 −7
Original line number Diff line number Diff line
@@ -108,13 +108,6 @@ 
            <intent android:action="com.android.settings.action.DEMO_MODE" />

        </Preference>



        <ListPreference

            android:key="dark_ui_mode"

            android:title="@string/dark_ui_mode"

            android:dialogTitle="@string/dark_ui_mode_title"

            android:entries="@array/dark_ui_mode_entries"

            android:entryValues="@array/dark_ui_mode_values" />



        <Preference

            android:key="quick_settings_tiles"

            android:title="@string/quick_settings_developer_tiles"

res/xml/display_settings.xml

+8 −9
Original line number Diff line number Diff line
@@ -108,15 +108,6 @@ 
        settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"

        settings:userRestriction="no_ambient_display" />



    <!-- Hide night mode for now

    <ListPreference

        android:key="night_mode"

        android:title="@string/night_mode_title"

        settings:keywords="@string/keywords_display_night_mode"

        android:summary="@string/night_mode_summary"

        android:entries="@array/night_mode_entries"

        android:entryValues="@array/night_mode_values" /> -->



    <SwitchPreference

        android:key="camera_gesture"

        android:title="@string/camera_gesture_title"
@@ -131,6 +122,14 @@ 
        android:title="@string/tap_to_wake"

        android:summary="@string/tap_to_wake_summary" />



    <ListPreference

        android:key="dark_ui_mode"

        android:title="@string/dark_ui_mode"

        android:dialogTitle="@string/dark_ui_mode_title"

        android:entries="@array/dark_ui_mode_entries"

        android:entryValues="@array/dark_ui_mode_values"

        settings:controller="com.android.settings.display.DarkUIPreferenceController" />



    <ListPreference

        android:key="theme"

        android:title="@string/device_theme"

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+0 −1
Original line number Diff line number Diff line
@@ -386,7 +386,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controllers.add(new LocalBackupPasswordPreferenceController(context));

        controllers.add(new StayAwakePreferenceController(context, lifecycle));

        controllers.add(new HdcpCheckingPreferenceController(context));

        controllers.add(new DarkUIPreferenceController(context));

        controllers.add(new BluetoothSnoopLogPreferenceController(context));

        controllers.add(new OemUnlockPreferenceController(context, activity, fragment));

        controllers.add(new FileEncryptionPreferenceController(context));

src/com/android/settings/development/DarkUIPreferenceController.java→src/com/android/settings/display/DarkUIPreferenceController.java

+23 −22
Original line number Diff line number Diff line
@@ -14,56 +14,57 @@ 
 * limitations under the License

 */



package com.android.settings.development;

package com.android.settings.display;



import android.app.UiModeManager;

import android.content.Context;



import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;

import com.android.settings.core.BasePreferenceController;



import androidx.annotation.VisibleForTesting;

import androidx.preference.ListPreference;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



public class DarkUIPreferenceController extends DeveloperOptionsPreferenceController

        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {

public class DarkUIPreferenceController extends BasePreferenceController

        implements Preference.OnPreferenceChangeListener {



    private static final String DARK_UI_KEY = "dark_ui_mode";

    private final UiModeManager mUiModeManager;

    private UiModeManager mUiModeManager;



    public DarkUIPreferenceController(Context context) {

        this(context, context.getSystemService(UiModeManager.class));

    public DarkUIPreferenceController(Context context, String key) {

        super(context, key);

        mUiModeManager = context.getSystemService(UiModeManager.class);

    }



    @VisibleForTesting

    DarkUIPreferenceController(Context context, UiModeManager uiModeManager) {

        super(context);

    void setUiModeManager(UiModeManager uiModeManager) {

        mUiModeManager = uiModeManager;

    }



    @Override

    public String getPreferenceKey() {

        return DARK_UI_KEY;

    public int getAvailabilityStatus() {

        return AVAILABLE;

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        int value = mUiModeManager.getNightMode();

        ListPreference preference = (ListPreference) screen.findPreference(getPreferenceKey());

        preference.setValue(modeToString(value));

    }



    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        mUiModeManager.setNightMode(modeToInt((String) newValue));

        updateSummary(preference);

        refreshSummary(preference);

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        updateSummary(preference);

    }



    private void updateSummary(Preference preference) {

        int mode = mUiModeManager.getNightMode();

        ((ListPreference) preference).setValue(modeToString(mode));

        preference.setSummary(modeToDescription(mode));

    public CharSequence getSummary() {

        return modeToDescription(mUiModeManager.getNightMode());

    }



    private String modeToDescription(int mode) {

tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java→tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java

+5 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.settings.development;

package com.android.settings.display;



import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.verify;
@@ -23,11 +23,13 @@ import static org.mockito.Mockito.when; 
import android.app.UiModeManager;

import android.content.Context;



import com.android.settings.display.DarkUIPreferenceController;

import com.android.settings.testutils.SettingsRobolectricTestRunner;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.InjectMocks;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RuntimeEnvironment;
@@ -51,7 +53,8 @@ public class DarkUIPreferenceControllerTest { 
    public void setup() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = new DarkUIPreferenceController(mContext, mUiModeManager);

        mController = new DarkUIPreferenceController(mContext, "dark_ui_mode");

        mController.setUiModeManager(mUiModeManager);

        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))

            .thenReturn(mPreference);

        mController.displayPreference(mPreferenceScreen);