From 5e2c84d01b946af0ad62ee02eed7ab76399c1e44 Mon Sep 17 00:00:00 2001 From: minaripenguin Date: Sat, 22 Jun 2024 12:50:55 +0800 Subject: [PATCH] colors: Introduce Reality display engine [2/2] Change-Id: Ib565b3ffaa8a5f5832d5a620961abffd754e2dfc Signed-off-by: minaripenguin --- res/values/evolution_arrays.xml | 13 ++++++++++ res/values/evolution_strings.xml | 8 ++++++ res/xml/color_mode_settings.xml | 25 ++++++++++++++++++- .../display/ColorModePreferenceFragment.java | 10 ++++++++ 4 files changed, 55 insertions(+), 1 deletion(-) diff --git a/res/values/evolution_arrays.xml b/res/values/evolution_arrays.xml index 03e7b5e274b..fd2e8f60d09 100644 --- a/res/values/evolution_arrays.xml +++ b/res/values/evolution_arrays.xml @@ -154,4 +154,17 @@ 4 5 + + + + @string/display_engine_default + @string/x_reality_engine_mode_title + @string/vivid_engine_mode_title + + + + 0 + 1 + 2 + diff --git a/res/values/evolution_strings.xml b/res/values/evolution_strings.xml index 98f9f7ac469..5d8ed4870dd 100644 --- a/res/values/evolution_strings.xml +++ b/res/values/evolution_strings.xml @@ -313,4 +313,12 @@ Background processes + + + Display engine + Reality display engine + X-Reality engine + Vivid display + Default + Inspired by Sony\'s Bravia/X-Reality engine, the Display Engine features Vivid mode for enhanced brightness and color saturation, and X-Reality mode for improved detail and color accuracy. diff --git a/res/xml/color_mode_settings.xml b/res/xml/color_mode_settings.xml index 6044141c71f..8cfda61c67e 100644 --- a/res/xml/color_mode_settings.xml +++ b/res/xml/color_mode_settings.xml @@ -17,4 +17,27 @@ + xmlns:settings="http://schemas.android.com/apk/res-auto" + android:title="@string/color_mode_title"> + + + + + + + + + diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java index 2318d08d8a8..0898257d130 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -199,6 +199,16 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment { updateIndicator(mViewPager.getCurrentItem()); } + @Override + public void updateCandidates() { + super.updateCandidates(); + PreferenceScreen screen = getPreferenceScreen(); + if (ColorDisplayManager.isColorTransformAccelerated(screen.getContext())) { + getPreferenceManager().inflateFromResource(screen.getContext(), R.xml.color_mode_settings, + screen); + } + } + @Override protected void addStaticPreferences(PreferenceScreen screen) { final LayoutPreference preview = new LayoutPreference(screen.getContext(),