From 0217281d33e9f76c703073a0a8f8ea565a55dae9 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Fri, 18 Sep 2015 16:16:52 -0400 Subject: [PATCH] Add color transform setting Bug: 24038268 Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6 --- res/layout/ignore_optimizations_content.xml | 2 +- res/layout/radio_list_container.xml | 22 +++ res/layout/radio_with_summary.xml | 2 +- res/values/strings.xml | 18 ++ res/xml/display_settings.xml | 6 + .../android/settings/ColorModePreference.java | 177 ++++++++++++++++++ src/com/android/settings/DisplaySettings.java | 30 +++ 7 files changed, 255 insertions(+), 2 deletions(-) create mode 100644 res/layout/radio_list_container.xml create mode 100644 src/com/android/settings/ColorModePreference.java diff --git a/res/layout/ignore_optimizations_content.xml b/res/layout/ignore_optimizations_content.xml index 17327d9108c..3a6db9d6ce9 100644 --- a/res/layout/ignore_optimizations_content.xml +++ b/res/layout/ignore_optimizations_content.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="8dp" - android:paddingBottom="8dp" + android:paddingBottom="4dp" android:orientation="vertical"> + + diff --git a/res/layout/radio_with_summary.xml b/res/layout/radio_with_summary.xml index 8df12107fa4..87b1d14b530 100644 --- a/res/layout/radio_with_summary.xml +++ b/res/layout/radio_with_summary.xml @@ -39,7 +39,7 @@ apps permissions security apps default ignore optimizations doze app standby + vibrant rgb srgb color natural standard slide password pattern pin @@ -7006,4 +7007,21 @@ Quickly open camera without unlocking your screen + + + + Vibrant (default) + Natural + Standard + + + + + Enhanced colors + Natural colors as seen by the eye + Colors optimized for digital content + + + + Picture color mode diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 7150150251e..6eaaeab46fb 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -104,6 +104,12 @@ android:key="auto_rotate" android:title="@string/display_auto_rotate_title" /> + + mDescriptions; + + public ColorModePreference(Context context, AttributeSet attrs) { + super(context, attrs); + mDisplayManager = getContext().getSystemService(DisplayManager.class); + } + + public int getTransformsCount() { + return mDescriptions.size(); + } + + public void startListening() { + mDisplayManager.registerDisplayListener(this, new Handler(Looper.getMainLooper())); + } + + public void stopListening() { + mDisplayManager.unregisterDisplayListener(this); + } + + @Override + public void onDisplayAdded(int displayId) { + if (displayId == Display.DEFAULT_DISPLAY) { + updateCurrentAndSupported(); + } + } + + @Override + public void onDisplayChanged(int displayId) { + if (displayId == Display.DEFAULT_DISPLAY) { + updateCurrentAndSupported(); + } + } + + @Override + public void onDisplayRemoved(int displayId) { + } + + public void updateCurrentAndSupported() { + mDisplay = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY); + + mDescriptions = new ArrayList<>(); + + Resources resources = getContext().getResources(); + int[] transforms = resources.getIntArray( + com.android.internal.R.array.config_colorTransforms); + String[] titles = resources.getStringArray(R.array.color_mode_names); + String[] descriptions = resources.getStringArray(R.array.color_mode_descriptions); + // Map the resource information describing color transforms. + for (int i = 0; i < transforms.length; i++) { + if (transforms[i] != -1) { + ColorTransformDescription desc = new ColorTransformDescription(); + desc.colorTransform = transforms[i]; + desc.title = titles[i]; + desc.summary = descriptions[i]; + mDescriptions.add(desc); + } + } + // Match up a ColorTransform to every description. + ColorTransform[] supportedColorTransforms = mDisplay.getSupportedColorTransforms(); + for (int i = 0; i < supportedColorTransforms.length; i++) { + for (int j = 0; j < mDescriptions.size(); j++) { + if (mDescriptions.get(j).colorTransform + == supportedColorTransforms[i].getColorTransform() + && mDescriptions.get(j).transform == null) { + mDescriptions.get(j).transform = supportedColorTransforms[i]; + break; + } + } + } + // Remove any extras that don't have a transform for some reason. + for (int i = 0; i < mDescriptions.size(); i++) { + if (mDescriptions.get(i).transform == null) { + mDescriptions.remove(i--); + } + } + + ColorTransform currentTransform = mDisplay.getColorTransform(); + mCurrentIndex = -1; + for (int i = 0; i < mDescriptions.size(); i++) { + if (mDescriptions.get(i).colorTransform == currentTransform.getColorTransform()) { + mCurrentIndex = i; + break; + } + } + if (mCurrentIndex != -1) { + setSummary(mDescriptions.get(mCurrentIndex).title); + } else { + setSummary(null); + } + } + + @Override + protected View onCreateDialogView() { + LayoutInflater inflater = LayoutInflater.from(getContext()); + LinearLayout v = (LinearLayout) inflater.inflate(R.layout.radio_list_container, null); + for (int i = 0; i < mDescriptions.size(); i++) { + View child = inflater.inflate(R.layout.radio_with_summary, v, false); + ColorTransformDescription desc = mDescriptions.get(i); + child.setTag(desc); + ((TextView) child.findViewById(android.R.id.title)).setText(desc.title); + ((TextView) child.findViewById(android.R.id.summary)).setText(desc.summary); + ((Checkable) child).setChecked(i == mCurrentIndex); + child.setClickable(true); + child.setOnClickListener(this); + v.addView(child); + } + return v; + } + + @Override + protected void onPrepareDialogBuilder(Builder builder) { + super.onPrepareDialogBuilder(builder); + builder.setPositiveButton(null, null); + } + + @Override + public void onClick(View v) { + ColorTransformDescription desc = (ColorTransformDescription) v.getTag(); + + mDisplay.requestColorTransform(desc.transform); + mCurrentIndex = mDescriptions.indexOf(desc); + + setSummary(desc.title); + getDialog().dismiss(); + } + + private static class ColorTransformDescription { + private int colorTransform; + private String title; + private String summary; + private ColorTransform transform; + } +} diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index de15d4cc64e..536a30eea78 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -79,6 +79,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements private static final String KEY_CAMERA_GESTURE = "camera_gesture"; private static final String KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE = "camera_double_tap_power_gesture"; + private static final String KEY_COLOR_MODE = "color_mode"; private static final int DLG_GLOBAL_CHANGE_WARNING = 1; @@ -96,6 +97,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements private SwitchPreference mCameraGesturePreference; private SwitchPreference mCameraDoubleTapPowerGesturePreference; + private ColorModePreference mColorModePreference; + @Override protected int getMetricsCategory() { return MetricsLogger.DISPLAY; @@ -171,6 +174,13 @@ public class DisplaySettings extends SettingsPreferenceFragment implements removePreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE); } + mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE); + mColorModePreference.updateCurrentAndSupported(); + if (mColorModePreference.getTransformsCount() < 2) { + removePreference(KEY_COLOR_MODE); + mColorModePreference = null; + } + if (RotationPolicy.isRotationLockToggleVisible(activity)) { DropDownPreference rotatePreference = (DropDownPreference) findPreference(KEY_AUTO_ROTATE); @@ -360,6 +370,17 @@ public class DisplaySettings extends SettingsPreferenceFragment implements public void onResume() { super.onResume(); updateState(); + if (mColorModePreference != null) { + mColorModePreference.startListening(); + } + } + + @Override + public void onPause() { + super.onPause(); + if (mColorModePreference != null) { + mColorModePreference.stopListening(); + } } @Override @@ -417,6 +438,10 @@ public class DisplaySettings extends SettingsPreferenceFragment implements getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0); mCameraDoubleTapPowerGesturePreference.setChecked(value == 0); } + + if (mColorModePreference != null) { + mColorModePreference.updateCurrentAndSupported(); + } } private void updateScreenSaverSummary() { @@ -556,6 +581,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements if (!isCameraDoubleTapPowerGestureAvailable(context.getResources())) { result.add(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE); } + ColorModePreference pref = new ColorModePreference(context, null); + pref.updateCurrentAndSupported(); + if (pref.getTransformsCount() < 2) { + result.add(KEY_COLOR_MODE); + } return result; } };