Merge "Update dark theme to have new screen" (ef1b5ceb) · Commits · e / os / android_packages_apps_Settings

res/xml/dark_ui_settings.xml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2019 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.
		-->
		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:title="@string/dark_ui_mode"
		android:key="dark_ui_mode_screen"
		settings:staticPreferenceLocation="append"
		settings:keywords="@string/keywords_dark_ui_mode">
		</PreferenceScreen >

res/xml/display_settings.xml

+5 −6

Original line number	Diff line number	Diff line
		@@ -58,13 +58,12 @@
		android:targetClass="@string/config_wallpaper_picker_class" />
		</com.android.settingslib.RestrictedPreference>

		<ListPreference

		<Preference
		android:key="dark_ui_mode"
		android:fragment="com.android.settings.display.DarkUISettings"
		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:keywords="@string/keywords_dark_ui_mode"
		settings:searchable="false"
		settings:controller="com.android.settings.display.DarkUIPreferenceController"/>

		<!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->

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

+3 −54

Original line number	Diff line number	Diff line
		@@ -27,8 +27,7 @@ import androidx.preference.PreferenceScreen;
		import com.android.settings.R;
		import com.android.settings.core.BasePreferenceController;

		public class DarkUIPreferenceController extends BasePreferenceController
		implements Preference.OnPreferenceChangeListener {
		public class DarkUIPreferenceController extends BasePreferenceController {

		private UiModeManager mUiModeManager;

		@@ -47,59 +46,9 @@ public class DarkUIPreferenceController extends BasePreferenceController
		return AVAILABLE;
		}

		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		int value = mUiModeManager.getNightMode();
		ListPreference preference = 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_YES:
		return values[0];
		case UiModeManager.MODE_NIGHT_NO:
		case UiModeManager.MODE_NIGHT_AUTO:
		default:
		return values[1];

		}
		}

		private String modeToString(int mode) {
		switch (mode) {
		case UiModeManager.MODE_NIGHT_YES:
		return "yes";
		case UiModeManager.MODE_NIGHT_NO:
		case UiModeManager.MODE_NIGHT_AUTO:
		default:
		return "no";

		}
		}

		private int modeToInt(String mode) {
		switch (mode) {
		case "yes":
		return UiModeManager.MODE_NIGHT_YES;
		case "no":
		case "auto":
		default:
		return UiModeManager.MODE_NIGHT_NO;
		}
		return DarkUISettingsRadioButtonsController.modeToDescription(
		mContext, mUiModeManager.getNightMode());
		}
		}

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

0 → 100644

+145 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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.app.settings.SettingsEnums;
		import android.content.Context;
		import android.graphics.drawable.Drawable;
		import android.provider.SearchIndexableResource;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;
		import com.android.settings.R;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		import com.android.settings.widget.RadioButtonPickerFragment;
		import com.android.settingslib.search.SearchIndexable;
		import com.android.settingslib.widget.CandidateInfo;
		import com.android.settingslib.widget.FooterPreference;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;

		/**
		* The screen for selecting the dark theme preference for this device. Automatically updates
		* the associated footer view with any needed information.
		*/
		@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
		public class DarkUISettings extends RadioButtonPickerFragment implements Indexable {

		private DarkUISettingsRadioButtonsController mController;
		private Preference mFooter;

		@Override
		protected int getPreferenceScreenResId() {
		return R.xml.dark_ui_settings;
		}

		@Override
		public void onAttach(Context context) {
		super.onAttach(context);
		// TODO(b/128686189): add illustration once it is ready
		setIllustration(0, 0);
		mFooter = new FooterPreference(context);
		mFooter.setIcon(android.R.color.transparent);
		mController = new DarkUISettingsRadioButtonsController(context, mFooter);
		}

		@Override
		protected List<? extends CandidateInfo> getCandidates() {
		final Context context = getContext();
		final List<CandidateInfo> candidates = new ArrayList<>();
		candidates.add(new DarkUISettingsCandidateInfo(
		DarkUISettingsRadioButtonsController.modeToDescription(
		context, UiModeManager.MODE_NIGHT_YES),
		/* summary */ null,
		DarkUISettingsRadioButtonsController.KEY_DARK,
		/* enabled */ true));
		candidates.add(new DarkUISettingsCandidateInfo(
		DarkUISettingsRadioButtonsController.modeToDescription(
		context, UiModeManager.MODE_NIGHT_NO),
		/* summary */ null,
		DarkUISettingsRadioButtonsController.KEY_LIGHT,
		/* enabled */ true));
		return candidates;
		}

		@Override
		protected void addStaticPreferences(PreferenceScreen screen) {
		screen.addPreference(mFooter);
		}

		@Override
		protected String getDefaultKey() {
		return mController.getDefaultKey();
		}

		@Override
		protected boolean setDefaultKey(String key) {
		return mController.setDefaultKey(key);
		}

		@Override
		public int getMetricsCategory() {
		return SettingsEnums.DARK_UI_SETTINGS;
		}

		static class DarkUISettingsCandidateInfo extends CandidateInfo {

		private final CharSequence mLabel;
		private final CharSequence mSummary;
		private final String mKey;

		DarkUISettingsCandidateInfo(CharSequence label, CharSequence summary, String key,
		boolean enabled) {
		super(enabled);
		mLabel = label;
		mKey = key;
		mSummary = summary;
		}

		@Override
		public CharSequence loadLabel() {
		return mLabel;
		}

		@Override
		public Drawable loadIcon() {
		return null;
		}

		@Override
		public String getKey() {
		return mKey;
		}

		public CharSequence getSummary() {
		return mSummary;
		}
		}

		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {
		@Override
		public List<SearchIndexableResource> getXmlResourcesToIndex(
		Context context, boolean enabled) {
		final SearchIndexableResource sir = new SearchIndexableResource(context);
		sir.xmlResId = R.xml.dark_ui_settings;
		return Arrays.asList(sir);
		}
		};
		}

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

0 → 100644

+86 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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 androidx.preference.Preference;
		import com.android.settings.R;
		import androidx.annotation.VisibleForTesting;

		public class DarkUISettingsRadioButtonsController {

		public static final String KEY_DARK = "key_dark_ui_settings_dark";
		public static final String KEY_LIGHT = "key_dark_ui_settings_light";

		@VisibleForTesting
		UiModeManager mManager;

		private Preference mFooter;

		public DarkUISettingsRadioButtonsController(Context context, Preference footer) {
		mManager = context.getSystemService(UiModeManager.class);
		mFooter = footer;
		}

		public String getDefaultKey() {
		final int mode = mManager.getNightMode();
		updateFooter();
		return mode == UiModeManager.MODE_NIGHT_YES ? KEY_DARK : KEY_LIGHT;
		}

		public boolean setDefaultKey(String key) {
		switch(key) {
		case KEY_DARK:
		mManager.setNightMode(UiModeManager.MODE_NIGHT_YES);
		break;
		case KEY_LIGHT:
		mManager.setNightMode(UiModeManager.MODE_NIGHT_NO);
		break;
		default:
		throw new IllegalStateException(
		"Not a valid key for " + this.getClass().getSimpleName() + ": " + key);
		}
		updateFooter();
		return true;
		}

		public void updateFooter() {
		final int mode = mManager.getNightMode();
		switch (mode) {
		case UiModeManager.MODE_NIGHT_YES:
		mFooter.setSummary(R.string.dark_ui_settings_dark_summary);
		break;
		case UiModeManager.MODE_NIGHT_NO:
		case UiModeManager.MODE_NIGHT_AUTO:
		default:
		mFooter.setSummary(R.string.dark_ui_settings_light_summary);
		}
		}

		public static String modeToDescription(Context context, int mode) {
		final String[] values = context.getResources().getStringArray(R.array.dark_ui_mode_entries);
		switch (mode) {
		case UiModeManager.MODE_NIGHT_YES:
		return values[0];
		case UiModeManager.MODE_NIGHT_NO:
		case UiModeManager.MODE_NIGHT_AUTO:
		default:
		return values[1];
		}
		}
		}