Add color transform setting

Bug: 24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6

5 files changed, 48 insertions, 2 deletions

diff --git a/res/layout/ignore_optimizations_content.xml b/res/layout/ignore_optimizations_content.xml
index 17327d9..3a6db9d 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">
 
     <include
diff --git a/res/layout/radio_list_container.xml b/res/layout/radio_list_container.xml
new file mode 100644
index 0000000..bf40abe
--- /dev/null
+++ b/res/layout/radio_list_container.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="8dp"
+    android:paddingBottom="4dp"
+    android:orientation="vertical" />
diff --git a/res/layout/radio_with_summary.xml b/res/layout/radio_with_summary.xml
index 8df1210..87b1d14 100644
--- a/res/layout/radio_with_summary.xml
+++ b/res/layout/radio_with_summary.xml
@@ -39,7 +39,7 @@
     <TextView android:id="@android:id/summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="4dp"
+        android:paddingBottom="8dp"
         android:paddingStart="52dp"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
         android:textColor="?android:attr/textColorSecondary"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 88dce90..09706e7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5953,6 +5953,7 @@
     <string name="keywords_app_permissions">apps permissions security</string>
     <string name="keywords_default_apps">apps default</string>
     <string name="keywords_ignore_optimizations">ignore optimizations doze app standby</string>
+    <string name="keywords_color_mode">vibrant rgb srgb color natural standard</string>
     <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
     <string name="keywords_lockscreen">slide password pattern pin</string>
 
@@ -7006,4 +7007,21 @@
 
     <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
     <string name="camera_double_tap_power_gesture_desc">Quickly open camera without unlocking your screen</string>
+
+    <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
+    <string-array name="color_mode_names">
+        <item>Vibrant (default)</item>
+        <item>Natural</item>
+        <item>Standard</item>
+    </string-array>
+
+    <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
+    <string-array name="color_mode_descriptions">
+        <item>Enhanced colors</item>
+        <item>Natural colors as seen by the eye</item>
+        <item>Colors optimized for digital content</item>
+    </string-array>
+
+    <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
+    <string name="picture_color_mode">Picture color mode</string>
 </resources>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 7150150..6eaaeab 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" />
 
+        <com.android.settings.ColorModePreference
+                android:key="color_mode"
+                android:title="@string/picture_color_mode"
+                android:persistent="false"
+                settings:keywords="@string/keywords_color_mode" />
+
         <PreferenceScreen
                 android:key="wifi_display"
                 android:title="@string/wifi_display_settings_title"