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

108
src/com/android/settings/display/DarkUIPreferenceController.java Normal file
View File

@@ -0,0 +1,108 @@
/*
* 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 android.app.UiModeManager;
import android.content.Context;
import com.android.settings.R;
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 BasePreferenceController
implements Preference.OnPreferenceChangeListener {
private UiModeManager mUiModeManager;
public DarkUIPreferenceController(Context context, String key) {
super(context, key);
mUiModeManager = context.getSystemService(UiModeManager.class);
}
@VisibleForTesting
void setUiModeManager(UiModeManager uiModeManager) {
mUiModeManager = uiModeManager;
}
@Override
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));
refreshSummary(preference);
return true;
}
@Override
public CharSequence getSummary() {
return modeToDescription(mUiModeManager.getNightMode());
}
private String modeToDescription(int mode) {
String[] values = mContext.getResources().getStringArray(R.array.dark_ui_mode_entries);
switch (mode) {
case UiModeManager.MODE_NIGHT_AUTO:
return values[0];
case UiModeManager.MODE_NIGHT_YES:
return values[1];
case UiModeManager.MODE_NIGHT_NO:
default:
return values[2];
}
}
private String modeToString(int mode) {
switch (mode) {
case UiModeManager.MODE_NIGHT_AUTO:
return "auto";
case UiModeManager.MODE_NIGHT_YES:
return "yes";
case UiModeManager.MODE_NIGHT_NO:
default:
return "no";
}
}
private int modeToInt(String mode) {
switch (mode) {
case "auto":
return UiModeManager.MODE_NIGHT_AUTO;
case "yes":
return UiModeManager.MODE_NIGHT_YES;
case "no":
default:
return UiModeManager.MODE_NIGHT_NO;
}
}
}

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];
}
}