Merge "Night mode wording"

2019-01-21 00:16:48 +00:00
parent bb24f21bee a1916172d8
commit ad867a1ba3
4 changed files with 12 additions and 16 deletions
--- a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
@@ -59,8 +59,9 @@ public class DarkUIPreferenceControllerTest {

    @Test
    public void onPreferenceChanged_setAuto() {
+        // Auto was deprecated, it should default to NO.
        mController.onPreferenceChange(mPreference, "auto");
-        verify(mUiModeManager).setNightMode(eq(UiModeManager.MODE_NIGHT_AUTO));
+        verify(mUiModeManager).setNightMode(eq(UiModeManager.MODE_NIGHT_NO));
    }

    @Test