Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update "Dark Theme" Settings screen to account for Modes that can toggle it

Browse Source 
Bedtime is no longer a special case.

Fixes: 361592187
Test: atest com.android.settings.display.darkmode
Flag: android.app.modes_ui
Change-Id: Iddc5d8142d6bc0bb1f5c4ead876ee201c8818b12
This commit is contained in:
Matías Hernández
2024-09-10 12:13:41 +02:00
parent 1ffafd365e
commit 2a3e8b3070
10 changed files with 562 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/display/darkmode/DarkModePreference.java
View File

@@ -23,8 +23,6 @@ import android.util.AttributeSet;
import com.android.settings.R;
import com.android.settingslib.PrimarySwitchPreference;
import java.time.LocalTime;
/**
* component for the display settings dark ui summary
*/
@@ -71,36 +69,8 @@ public class DarkModePreference extends PrimarySwitchPreference {
? R.string.dark_ui_mode_disabled_summary_dark_theme_on
: R.string.dark_ui_mode_disabled_summary_dark_theme_off;
setSummary(getContext().getString(stringId));
return;
}
final int mode = mUiModeManager.getNightMode();
String summary;
if (mode == UiModeManager.MODE_NIGHT_AUTO) {
summary = getContext().getString(active
? 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) {
summary = getContext().getString(active
? R.string.dark_ui_summary_on_auto_mode_custom_bedtime
: R.string.dark_ui_summary_off_auto_mode_custom_bedtime);
} else {
final LocalTime time = active
? mUiModeManager.getCustomNightModeEnd()
: mUiModeManager.getCustomNightModeStart();
final String timeStr = mFormat.of(time);
summary = getContext().getString(active
? R.string.dark_ui_summary_on_auto_mode_custom
: R.string.dark_ui_summary_off_auto_mode_custom, timeStr);
}
} else {
summary = getContext().getString(active
? R.string.dark_ui_summary_on_auto_mode_never
: R.string.dark_ui_summary_off_auto_mode_never);
setSummary(AutoDarkTheme.getStatus(getContext(), active));
}
setSummary(summary);
}
}