PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "q_dark_theme"

Browse Source 
* changes:
  Move NightMode to Display settings
  Revert "Setting to change sysui theme"
This commit is contained in:
TreeHugger Robot
2018-07-05 03:46:24 +00:00
committed by Android (Google) Code Review
parent 6098784bd5 a7ea18a6ce
commit 9fa595f9c2
9 changed files with 37 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/values/arrays.xml
View File

@@ -1106,20 +1106,6 @@
<item>no</item>
</string-array>
<!-- Titles for SystemUI theme preference. -->
<string-array name="systemui_theme_entries" >
<item>@string/systemui_theme_wallpaper</item>
<item>@string/systemui_theme_light</item>
<item>@string/systemui_theme_dark</item>
</string-array>
<!-- Values for SystemUI theme preference. -->
<string-array name="systemui_theme_values" translatable="false" >
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="gesture_prevent_ringing_entries" translatable="false">
<item>@string/prevent_ringing_option_vibrate</item>
<item>@string/prevent_ringing_option_mute</item>

11
res/values/strings.xml
View File

@@ -9944,21 +9944,12 @@
</string>
<!-- Name of setting for switching device theme [CHAR LIMIT=60] -->
<string name="color_theme">Color theme</string>
<string name="device_theme">Device theme</string>
<!-- Name of default device theme [CHAR LIMIT=60] -->
<string name="default_theme">Default</string>
<!-- Temporary reboot string, will be removed -->
<string name="change_theme_reboot" translatable="false">Changing the theme requires a restart.</string>
<!-- Name of setting for switching the SystemUI theme [CHAR LIMIT=60] -->
<string name="device_theme">Device theme</string>
<!-- When SystemUI theme is chosen based on the wallpaper color [CHAR LIMIT=60] -->
<string name="systemui_theme_wallpaper">Automatic (based on wallpaper)</string>
<!-- When SystemUI theme is light [CHAR LIMIT=60] -->
<string name="systemui_theme_light">Light</string>
<!-- When SystemUI theme is dark [CHAR LIMIT=60] -->
<string name="systemui_theme_dark">Dark</string>
<!-- Switch label to show operator name in the status bar [CHAR LIMIT=60] -->
<string name="show_operator_name_title">Network name</string>
<!-- Switch summary to show operator name in the status bar [CHAR LIMIT=NONE] -->

7
res/xml/development_settings.xml
View File

@@ -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"

25
res/xml/display_settings.xml
View File

@@ -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"
@@ -132,17 +123,17 @@
android:summary="@string/tap_to_wake_summary" />
<ListPreference
android:key="theme"
android:title="@string/color_theme"
android:summary="@string/summary_placeholder" />
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="systemui_theme"
android:key="theme"
android:title="@string/device_theme"
android:entries="@array/systemui_theme_entries"
android:entryValues="@array/systemui_theme_values"
settings:controller="com.android.settings.display.SystemUiThemePreferenceController"
settings:keywords="@string/keywords_systemui_theme" />
android:summary="@string/summary_placeholder" />
<Preference
android:key="vr_display_pref"

1
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -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));

45
src/com/android/settings/development/DarkUIPreferenceController.java → src/com/android/settings/display/DarkUIPreferenceController.java
View File

@@ -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) {

72
src/com/android/settings/display/SystemUiThemePreferenceController.java
View File

@@ -1,72 +0,0 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.settings.display;
import static android.provider.Settings.Secure.THEME_MODE;
import android.content.Context;
import android.provider.Settings;
import android.util.FeatureFlagUtils;
import com.android.settings.core.BasePreferenceController;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
/**
* Setting where user can pick if SystemUI will be light, dark or try to match
* the wallpaper colors.
*/
public class SystemUiThemePreferenceController extends BasePreferenceController
implements Preference.OnPreferenceChangeListener {
private ListPreference mSystemUiThemePref;
public SystemUiThemePreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
boolean enabled = FeatureFlagUtils.isEnabled(mContext, "settings_systemui_theme");
return enabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mSystemUiThemePref = (ListPreference) screen.findPreference(getPreferenceKey());
int value = Settings.Secure.getInt(mContext.getContentResolver(), THEME_MODE, 0);
mSystemUiThemePref.setValue(Integer.toString(value));
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
int value = Integer.parseInt((String) newValue);
Settings.Secure.putInt(mContext.getContentResolver(), THEME_MODE, value);
refreshSummary(preference);
return true;
}
@Override
public CharSequence getSummary() {
int value = Settings.Secure.getInt(mContext.getContentResolver(), THEME_MODE, 0);
int index = mSystemUiThemePref.findIndexOfValue(Integer.toString(value));
return mSystemUiThemePref.getEntries()[index];
}
}

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

@@ -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);

87
tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java
View File

@@ -1,87 +0,0 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.settings.display;
import static android.provider.Settings.Secure.THEME_MODE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
@RunWith(SettingsRobolectricTestRunner.class)
public class SystemUiThemePreferenceControllerTest {
@Mock
private PreferenceScreen mPreferenceScreen;
@Mock
private ListPreference mListPreference;
private Context mContext;
private SystemUiThemePreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
when(mPreferenceScreen.findPreference(anyString())).thenReturn(mListPreference);
CharSequence[] entries = mContext.getResources().getStringArray(
R.array.systemui_theme_entries);
when(mListPreference.getEntries()).thenReturn(entries);
mController = spy(new SystemUiThemePreferenceController(mContext, "systemui_theme"));
}
@Test
public void displayPreference_readsSetting() {
Settings.Secure.putInt(mContext.getContentResolver(), THEME_MODE, 2);
mController.displayPreference(mPreferenceScreen);
verify(mListPreference).setValue(eq("2"));
}
@Test
public void onPreferenceChange_writesSetting() {
Settings.Secure.putInt(mContext.getContentResolver(), THEME_MODE, 2);
mController.displayPreference(mPreferenceScreen);
mController.onPreferenceChange(mListPreference, "0");
int value = Settings.Secure.getInt(mContext.getContentResolver(), THEME_MODE, 2);
assertThat(value).isEqualTo(0);
}
@Test
public void onPreferenceChange_updatesSummary() {
mController.displayPreference(mPreferenceScreen);
mController.onPreferenceChange(mListPreference, "0");
verify(mController).getSummary();
}
}