Merge "Update "Dark Theme" Settings screen to account for Modes that can toggle it" into main (00e86639) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2938,6 +2938,8 @@
	<string name="dark_ui_summary_off_auto_mode_custom">Will turn on automatically at <xliff:g name="time" example="6 AM">%1$s</xliff:g></string>		<string name="dark_ui_summary_off_auto_mode_custom">Will turn on automatically at <xliff:g name="time" example="6 AM">%1$s</xliff:g></string>
	<!-- Display settings screen, summary of Dark UI when off and will turn on automatically at bedtime. [CHAR LIMIT=NONE] -->		<!-- Display settings screen, summary of Dark UI when off and will turn on automatically at bedtime. [CHAR LIMIT=NONE] -->
	<string name="dark_ui_summary_off_auto_mode_custom_bedtime">Will turn on automatically at bedtime</string>		<string name="dark_ui_summary_off_auto_mode_custom_bedtime">Will turn on automatically at bedtime</string>
			<!-- Display settings screen, summary of Dark UI when off and controlled by Modes. [CHAR LIMIT=NONE] -->
			<string name="dark_ui_summary_off_auto_mode_modes">Will turn on when <xliff:g name="modeName" example="Bedtime">%1$s</xliff:g> starts</string>
	<!-- Display settings screen, summary of Dark UI when on and will never turn off automatically. [CHAR LIMIT=NONE] -->		<!-- Display settings screen, summary of Dark UI when on and will never turn off automatically. [CHAR LIMIT=NONE] -->
	<string name="dark_ui_summary_on_auto_mode_never">Will never turn off automatically</string>		<string name="dark_ui_summary_on_auto_mode_never">Will never turn off automatically</string>
	<!-- Display settings screen, summary of Dark UI when on and will turn off automatically at sunrise. [CHAR LIMIT=NONE] -->		<!-- Display settings screen, summary of Dark UI when on and will turn off automatically at sunrise. [CHAR LIMIT=NONE] -->
	@@ -2946,12 +2948,26 @@
	<string name="dark_ui_summary_on_auto_mode_custom">Will turn off automatically at <xliff:g name="time" example="10 PM">%1$s</xliff:g></string>		<string name="dark_ui_summary_on_auto_mode_custom">Will turn off automatically at <xliff:g name="time" example="10 PM">%1$s</xliff:g></string>
	<!-- Display settings screen, summary of Dark UI when on and will turn off automatically after bedtime. [CHAR LIMIT=NONE] -->		<!-- Display settings screen, summary of Dark UI when on and will turn off automatically after bedtime. [CHAR LIMIT=NONE] -->
	<string name="dark_ui_summary_on_auto_mode_custom_bedtime">Will turn off automatically after bedtime</string>		<string name="dark_ui_summary_on_auto_mode_custom_bedtime">Will turn off automatically after bedtime</string>
			<!-- Display settings screen, summary of Dark UI when on and controlled by Modes. [CHAR LIMIT=NONE] -->
			<string name="dark_ui_summary_on_auto_mode_modes">Will turn off when <xliff:g name="modeName" example="Bedtime">%1$s</xliff:g> ends</string>
	<!-- Dark theme screen, description of Dark theme feature. [CHAR LIMIT=NONE] -->		<!-- Dark theme screen, description of Dark theme feature. [CHAR LIMIT=NONE] -->
	<string name="dark_ui_text">Dark theme uses a black background to help keep battery alive longer on some screens. Dark theme schedules wait to turn on until your screen is off.</string>		<string name="dark_ui_text">Dark theme uses a black background to help keep battery alive longer on some screens. Dark theme schedules wait to turn on until your screen is off.</string>
	<!-- Dark UI screen footer summary text shown when the when Dark theme turns on/off automatically according to a user bedtime schedule. [CHAR LIMIT=NONE] -->		<!-- Dark UI screen footer summary text shown when the when Dark theme turns on/off automatically according to a user bedtime schedule. [CHAR LIMIT=NONE] -->
	<string name="dark_ui_bedtime_footer_summary">Dark theme is currently following your Bedtime mode schedule</string>		<string name="dark_ui_bedtime_footer_summary">Dark theme is currently following your Bedtime mode schedule</string>
	<!-- Dark UI screen footer action text shown when the when Dark theme turns on/off automatically according to a user bedtime schedule. [CHAR LIMIT=NONE] -->		<!-- Dark UI screen footer action text shown when the when Dark theme turns on/off automatically according to a user bedtime schedule. [CHAR LIMIT=NONE] -->
	<string name="dark_ui_bedtime_footer_action">Bedtime mode settings</string>		<string name="dark_ui_bedtime_footer_action">Bedtime mode settings</string>
			<!-- Dark UI screen footer summary text shown to indicate Modes may turn on/off Dark theme automatically according to their triggers. [CHAR LIMIT=NONE] -->
			<string name="dark_ui_modes_footer_summary">
			{count, plural, offset:2
			=0 {Modes can also activate dark theme}
			=1 {{mode_1} also activates dark theme}
			=2 {{mode_1} and {mode_2} also activate dark theme}
			=3 {{mode_1}, {mode_2}, and {mode_3} also activate dark theme}
			other {{mode_1}, {mode_2}, and # more also activate dark theme}
			}
			</string>
			<!-- Dark UI screen footer action text linking to Modes settings. [CHAR LIMIT=NONE] -->
			<string name="dark_ui_modes_footer_action">Modes settings</string>
	<!-- Even Dimmer setting title. Allows device to reduce brightness even further than standard range. [CHAR LIMIT=NONE] -->		<!-- Even Dimmer setting title. Allows device to reduce brightness even further than standard range. [CHAR LIMIT=NONE] -->
	<string name="even_dimmer_display_title">Even dimmer</string>		<string name="even_dimmer_display_title">Even dimmer</string>
	<!-- Even Dimmer setting summary. [CHAR LIMIT=NONE] -->		<!-- Even Dimmer setting summary. [CHAR LIMIT=NONE] -->

res/xml/dark_mode_settings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,6 +60,6 @@
	android:title="@string/dark_ui_bedtime_footer_summary"		android:title="@string/dark_ui_bedtime_footer_summary"
	android:selectable="false"		android:selectable="false"
	settings:searchable="false"		settings:searchable="false"
	settings:controller="com.android.settings.display.darkmode.DarkModeCustomBedtimePreferenceController" />		settings:controller="com.android.settings.display.darkmode.DarkModeCustomModesPreferenceController" />

	</PreferenceScreen>		</PreferenceScreen>

src/com/android/settings/display/darkmode/AutoDarkTheme.java

0 → 100644

+105 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2024 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.darkmode;

			import static android.app.UiModeManager.MODE_ATTENTION_THEME_OVERLAY_NIGHT;
			import static android.app.UiModeManager.MODE_NIGHT_AUTO;
			import static android.app.UiModeManager.MODE_NIGHT_CUSTOM_TYPE_BEDTIME;
			import static android.app.UiModeManager.MODE_NIGHT_CUSTOM_TYPE_SCHEDULE;

			import static com.google.common.base.Preconditions.checkNotNull;

			import android.app.Flags;
			import android.app.UiModeManager;
			import android.content.Context;

			import com.android.settings.R;
			import com.android.settingslib.notification.modes.ZenMode;
			import com.android.settingslib.notification.modes.ZenModesBackend;

			import java.time.LocalTime;
			import java.util.List;

			class AutoDarkTheme {

			static String getStatus(Context context, boolean active) {
			UiModeManager uiModeManager = checkNotNull(context.getSystemService(UiModeManager.class));
			final int mode = uiModeManager.getNightMode();

			if (mode == MODE_NIGHT_AUTO) {
			return context.getString(active
			? R.string.dark_ui_summary_on_auto_mode_auto
			: R.string.dark_ui_summary_off_auto_mode_auto);
			}

			if (Flags.modesUi()) {
			if (active && uiModeManager.getAttentionModeThemeOverlay()
			== MODE_ATTENTION_THEME_OVERLAY_NIGHT) {
			List<String> modes = getActiveModesThatChangeDarkTheme(context);
			if (!modes.isEmpty()) {
			return context.getString(R.string.dark_ui_summary_on_auto_mode_modes,
			modes.get(0));
			}
			} else if (!active) {
			List<String> modes = getModesThatChangeDarkTheme(context);
			if (!modes.isEmpty()) {
			return context.getString(R.string.dark_ui_summary_off_auto_mode_modes,
			modes.get(0));
			}
			}
			}

			if (mode == UiModeManager.MODE_NIGHT_CUSTOM) {
			int modeCustomType = uiModeManager.getNightModeCustomType();
			if (!Flags.modesUi() && modeCustomType == MODE_NIGHT_CUSTOM_TYPE_BEDTIME) {
			return context.getString(active
			? R.string.dark_ui_summary_on_auto_mode_custom_bedtime
			: R.string.dark_ui_summary_off_auto_mode_custom_bedtime);
			}
			if (modeCustomType == MODE_NIGHT_CUSTOM_TYPE_SCHEDULE) {
			final LocalTime time = active
			? uiModeManager.getCustomNightModeEnd()
			: uiModeManager.getCustomNightModeStart();
			final String timeStr = new TimeFormatter(context).of(time);
			return context.getString(active
			? R.string.dark_ui_summary_on_auto_mode_custom
			: R.string.dark_ui_summary_off_auto_mode_custom, timeStr);
			}
			}

			return context.getString(active
			? R.string.dark_ui_summary_on_auto_mode_never
			: R.string.dark_ui_summary_off_auto_mode_never);
			}

			static List<String> getModesThatChangeDarkTheme(Context context) {
			return ZenModesBackend.getInstance(context)
			.getModes().stream()
			.filter(m -> m.getDeviceEffects().shouldUseNightMode())
			.map(ZenMode::getName)
			.toList();
			}

			static List<String> getActiveModesThatChangeDarkTheme(Context context) {
			return ZenModesBackend.getInstance(context)
			.getModes().stream()
			.filter(ZenMode::isActive)
			.filter(m -> m.getDeviceEffects().shouldUseNightMode())
			.map(ZenMode::getName)
			.toList();
			}
			}

src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java

+1 −37

Original line number	Original line	Diff line number	Diff line
	@@ -24,14 +24,11 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
	import androidx.preference.Preference;		import androidx.preference.Preference;
	import androidx.preference.PreferenceScreen;		import androidx.preference.PreferenceScreen;

	import com.android.settings.R;
	import com.android.settings.core.BasePreferenceController;		import com.android.settings.core.BasePreferenceController;
	import com.android.settings.overlay.FeatureFactory;		import com.android.settings.overlay.FeatureFactory;
	import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
	import com.android.settingslib.widget.MainSwitchPreference;		import com.android.settingslib.widget.MainSwitchPreference;

	import java.time.LocalTime;

	/**		/**
	* Controller for activate/deactivate night mode button		* Controller for activate/deactivate night mode button
	*/		*/
	@@ -40,22 +37,14 @@ public class DarkModeActivationPreferenceController extends BasePreferenceContro

	private final UiModeManager mUiModeManager;		private final UiModeManager mUiModeManager;
	private final MetricsFeatureProvider mMetricsFeatureProvider;		private final MetricsFeatureProvider mMetricsFeatureProvider;
	private TimeFormatter mFormat;
	private MainSwitchPreference mPreference;		private MainSwitchPreference mPreference;

	public DarkModeActivationPreferenceController(Context context, String preferenceKey) {		public DarkModeActivationPreferenceController(Context context, String preferenceKey) {
	super(context, preferenceKey);		super(context, preferenceKey);
	mUiModeManager = context.getSystemService(UiModeManager.class);		mUiModeManager = context.getSystemService(UiModeManager.class);
	mFormat = new TimeFormatter(context);
	mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();		mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
	}		}

	public DarkModeActivationPreferenceController(Context context, String preferenceKey,
	TimeFormatter f) {
	this(context, preferenceKey);
	mFormat = f;
	}

	@Override		@Override
	public final void updateState(Preference preference) {		public final void updateState(Preference preference) {
	final boolean active = (mContext.getResources().getConfiguration().uiMode		final boolean active = (mContext.getResources().getConfiguration().uiMode
	@@ -67,32 +56,7 @@ public class DarkModeActivationPreferenceController extends BasePreferenceContro
	public CharSequence getSummary() {		public CharSequence getSummary() {
	final boolean isActivated = (mContext.getResources().getConfiguration().uiMode		final boolean isActivated = (mContext.getResources().getConfiguration().uiMode
	& Configuration.UI_MODE_NIGHT_YES) != 0;		& Configuration.UI_MODE_NIGHT_YES) != 0;
	final int mode = mUiModeManager.getNightMode();		return AutoDarkTheme.getStatus(mContext, isActivated);
	if (mode == UiModeManager.MODE_NIGHT_AUTO) {
	return mContext.getString(isActivated
	? R.string.dark_ui_summary_on_auto_mode_auto
	: R.string.dark_ui_summary_off_auto_mode_auto);
	} else if (mode == UiModeManager.MODE_NIGHT_CUSTOM) {
	if (mUiModeManager.getNightModeCustomType()
	== UiModeManager.MODE_NIGHT_CUSTOM_TYPE_BEDTIME) {
	return mContext.getString(isActivated
	? R.string.dark_ui_summary_on_auto_mode_custom_bedtime
	: R.string.dark_ui_summary_off_auto_mode_custom_bedtime);
	}

	final LocalTime time = isActivated
	? mUiModeManager.getCustomNightModeEnd()
	: mUiModeManager.getCustomNightModeStart();
	final String timeStr = mFormat.of(time);

	return mContext.getString(isActivated
	? R.string.dark_ui_summary_on_auto_mode_custom
	: R.string.dark_ui_summary_off_auto_mode_custom, timeStr);
	} else {
	return mContext.getString(isActivated
	? R.string.dark_ui_summary_on_auto_mode_never
	: R.string.dark_ui_summary_off_auto_mode_never);
	}
	}		}

	@Override		@Override

src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java→src/com/android/settings/display/darkmode/DarkModeCustomModesPreferenceController.java

+112 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,25 +17,37 @@
	package com.android.settings.display.darkmode;		package com.android.settings.display.darkmode;

	import static android.app.UiModeManager.MODE_NIGHT_CUSTOM_TYPE_BEDTIME;		import static android.app.UiModeManager.MODE_NIGHT_CUSTOM_TYPE_BEDTIME;
			import static android.app.settings.SettingsEnums.DARK_UI_SETTINGS;

			import static com.google.common.base.Preconditions.checkNotNull;

			import android.app.Flags;
	import android.app.UiModeManager;		import android.app.UiModeManager;
	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
			import android.icu.text.MessageFormat;

			import androidx.annotation.NonNull;
	import androidx.preference.Preference;		import androidx.preference.Preference;
	import androidx.preference.PreferenceScreen;		import androidx.preference.PreferenceScreen;

	import com.android.settings.R;		import com.android.settings.R;
	import com.android.settings.core.BasePreferenceController;		import com.android.settings.core.BasePreferenceController;
			import com.android.settings.core.SubSettingLauncher;
			import com.android.settings.notification.modes.ZenModesListFragment;
	import com.android.settingslib.widget.FooterPreference;		import com.android.settingslib.widget.FooterPreference;

	/** Controller for the night mode bedtime custom mode footer. */		import java.util.HashMap;
	public class DarkModeCustomBedtimePreferenceController extends BasePreferenceController {		import java.util.List;
			import java.util.Locale;
			import java.util.Map;

			/** Controller for the dark theme Modes / Bedtime custom footer. */
			public class DarkModeCustomModesPreferenceController extends BasePreferenceController {
	private final UiModeManager mUiModeManager;		private final UiModeManager mUiModeManager;
	private FooterPreference mFooterPreference;		private final BedtimeSettings mBedtimeSettings;
	private BedtimeSettings mBedtimeSettings;

	public DarkModeCustomBedtimePreferenceController(Context context, String key) {		public DarkModeCustomModesPreferenceController(@NonNull Context context, @NonNull String key) {
	super(context, key);		super(context, key);
	mUiModeManager = context.getSystemService(UiModeManager.class);		mUiModeManager = context.getSystemService(UiModeManager.class);
	mBedtimeSettings = new BedtimeSettings(context);		mBedtimeSettings = new BedtimeSettings(context);
	@@ -43,28 +55,53 @@ public class DarkModeCustomBedtimePreferenceController extends BasePreferenceCon

	@Override		@Override
	public int getAvailabilityStatus() {		public int getAvailabilityStatus() {
	return mBedtimeSettings.getBedtimeSettingsIntent() == null		return (Flags.modesUi() \|\| mBedtimeSettings.getBedtimeSettingsIntent() != null)
	? UNSUPPORTED_ON_DEVICE		? AVAILABLE_UNSEARCHABLE
	: AVAILABLE_UNSEARCHABLE;		: UNSUPPORTED_ON_DEVICE;
	}		}

	@Override		@Override
	public void displayPreference(PreferenceScreen screen) {		public void displayPreference(@NonNull PreferenceScreen screen) {
	super.displayPreference(screen);		super.displayPreference(screen);
	mFooterPreference = screen.findPreference(getPreferenceKey());		FooterPreference footerPreference = checkNotNull(screen.findPreference(getPreferenceKey()));
	mFooterPreference.setLearnMoreAction(		if (Flags.modesUi()) {
			List<String> modesUsingDarkTheme = AutoDarkTheme.getModesThatChangeDarkTheme(
			screen.getContext());

			MessageFormat titleFormat = new MessageFormat(
			mContext.getString(R.string.dark_ui_modes_footer_summary),
			Locale.getDefault());
			Map<String, Object> args = new HashMap<>();
			args.put("count", modesUsingDarkTheme.size());
			for (int i = 0; i < modesUsingDarkTheme.size() && i < 3; i++) {
			args.put("mode_" + (i + 1), modesUsingDarkTheme.get(i));
			}
			footerPreference.setTitle(titleFormat.format(args));

			footerPreference.setLearnMoreAction(
			v -> new SubSettingLauncher(v.getContext())
			.setDestination(ZenModesListFragment.class.getName())
			.setSourceMetricsCategory(DARK_UI_SETTINGS)
			.launch());
			footerPreference.setLearnMoreText(
			mContext.getString(R.string.dark_ui_modes_footer_action));
			} else {
			footerPreference.setTitle(R.string.dark_ui_bedtime_footer_summary);
			footerPreference.setLearnMoreAction(
	v -> {		v -> {
	Intent bedtimeSettingsIntent = mBedtimeSettings.getBedtimeSettingsIntent();		Intent bedtimeSettingsIntent = mBedtimeSettings.getBedtimeSettingsIntent();
	if (bedtimeSettingsIntent != null) {		if (bedtimeSettingsIntent != null) {
	v.getContext().startActivity(bedtimeSettingsIntent);		v.getContext().startActivity(bedtimeSettingsIntent);
	}		}
	});		});
	mFooterPreference.setLearnMoreText(		footerPreference.setLearnMoreText(
	mContext.getString(R.string.dark_ui_bedtime_footer_action));		mContext.getString(R.string.dark_ui_bedtime_footer_action));
	}		}
			}

	@Override		@Override
	public void updateState(Preference preference) {		public void updateState(@NonNull Preference preference) {
			if (!Flags.modesUi()) {
	if (mUiModeManager.getNightModeCustomType() != MODE_NIGHT_CUSTOM_TYPE_BEDTIME) {		if (mUiModeManager.getNightModeCustomType() != MODE_NIGHT_CUSTOM_TYPE_BEDTIME) {
	preference.setVisible(false);		preference.setVisible(false);
	return;		return;
	@@ -72,3 +109,4 @@ public class DarkModeCustomBedtimePreferenceController extends BasePreferenceCon
	preference.setVisible(true);		preference.setVisible(true);
	}		}
	}		}
			}