From 228f65e1c460f0e632ad38351820a49821e81589 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Thu, 21 Jul 2016 23:55:13 -0700
Subject: Revert "Settings: Add screen color settings"

 * We now have support for HSIC controls in LiveDisplay and this
   can be deprecated. A new UI to bring the same kind of functionality
   is underway as well.

This reverts commit 853513841512a0fbf15dc22c7164a98d0a2de80b.

Change-Id: I4fa3af25f64b05338a78ba7832e75333cf15e448
---
 Android.mk                                         |   3 -
 AndroidManifest.xml                                |  10 -
 res/drawable-hdpi/btn_default.9.png                | Bin 1214 -> 0 bytes
 res/drawable-hdpi/btn_default_disabled.9.png       | Bin 1210 -> 0 bytes
 .../btn_default_disabled_focused_holo_dark.9.png   | Bin 421 -> 0 bytes
 .../btn_default_focused_holo_dark.9.png            | Bin 457 -> 0 bytes
 .../btn_default_pressed_holo_dark.9.png            | Bin 645 -> 0 bytes
 res/drawable-hdpi/default_screencolor_setting.png  | Bin 428934 -> 0 bytes
 res/drawable-hdpi/ic_down.png                      | Bin 3163 -> 0 bytes
 res/drawable-hdpi/ic_down_pressed.png              | Bin 3466 -> 0 bytes
 res/drawable-hdpi/ic_more_default.png              | Bin 2835 -> 0 bytes
 res/drawable-hdpi/ic_more_pressed.png              | Bin 3119 -> 0 bytes
 res/drawable-hdpi/ic_new_default.png               | Bin 3109 -> 0 bytes
 res/drawable-hdpi/ic_new_dis.png                   | Bin 2843 -> 0 bytes
 res/drawable-hdpi/ic_new_glow.png                  | Bin 3831 -> 0 bytes
 res/drawable-hdpi/ic_new_pressed.png               | Bin 3075 -> 0 bytes
 res/drawable-hdpi/ic_previous_default.png          | Bin 3415 -> 0 bytes
 res/drawable-hdpi/ic_previous_dis.png              | Bin 3087 -> 0 bytes
 res/drawable-hdpi/ic_previous_glow.png             | Bin 4804 -> 0 bytes
 res/drawable-hdpi/ic_previous_pressed.png          | Bin 3268 -> 0 bytes
 res/drawable-hdpi/ic_up.png                        | Bin 3168 -> 0 bytes
 res/drawable-hdpi/ic_up_pressed.png                | Bin 3473 -> 0 bytes
 res/drawable-hdpi/ic_zoom_in_holo_dark.png         | Bin 515 -> 0 bytes
 res/drawable-hdpi/ic_zoom_in_holo_light.png        | Bin 506 -> 0 bytes
 res/drawable-hdpi/ic_zoom_out_holo_dark.png        | Bin 379 -> 0 bytes
 res/drawable-hdpi/ic_zoom_out_holo_light.png       | Bin 406 -> 0 bytes
 res/drawable-hdpi/ic_zoom_slider.png               | Bin 2110 -> 0 bytes
 res/drawable-hdpi/scrubber_track_holo_dark.9.png   | Bin 167 -> 0 bytes
 res/drawable/down_button.xml                       |  33 -
 res/drawable/ic_zoom_in.xml                        |  34 -
 res/drawable/ic_zoom_out.xml                       |  34 -
 res/drawable/more_button.xml                       |  33 -
 res/drawable/new_button.xml                        |  33 -
 res/drawable/new_glow_button.xml                   |  33 -
 res/drawable/previous_button.xml                   |  33 -
 res/drawable/previous_glow_button.xml              |  33 -
 res/drawable/screencolor_btn.xml                   |  44 --
 res/drawable/seekbar_define_style.xml              |  33 -
 res/drawable/up_button.xml                         |  33 -
 res/layout/custom_screencolor.xml                  | 287 --------
 res/layout/screen_color_item.xml                   |  93 ---
 res/layout/screencolor_settings.xml                |  49 --
 res/menu/screencolor_more.xml                      |  46 --
 res/values-af/cm_strings.xml                       |   8 -
 res/values-ar/cm_strings.xml                       |   8 -
 res/values-as-rIN/cm_strings.xml                   |   8 -
 res/values-ast-rES/cm_strings.xml                  |   8 -
 res/values-az-rAZ/cm_strings.xml                   |   8 -
 res/values-be/cm_strings.xml                       |   8 -
 res/values-bg/cm_strings.xml                       |   8 -
 res/values-bn-rBD/cm_strings.xml                   |   5 -
 res/values-ca/cm_strings.xml                       |   8 -
 res/values-cs/cm_strings.xml                       |   8 -
 res/values-da/cm_strings.xml                       |   8 -
 res/values-de/cm_strings.xml                       |   8 -
 res/values-el/cm_strings.xml                       |   8 -
 res/values-en-rAU/cm_strings.xml                   |   8 -
 res/values-en-rIN/cm_strings.xml                   |   8 -
 res/values-eo/cm_strings.xml                       |   8 -
 res/values-es-rUS/cm_strings.xml                   |   8 -
 res/values-es/cm_strings.xml                       |   8 -
 res/values-et-rEE/cm_strings.xml                   |   8 -
 res/values-eu-rES/cm_strings.xml                   |   8 -
 res/values-fa/cm_strings.xml                       |   8 -
 res/values-fi/cm_strings.xml                       |   8 -
 res/values-fr/cm_strings.xml                       |   8 -
 res/values-fy-rNL/cm_strings.xml                   |   2 -
 res/values-gu-rIN/cm_strings.xml                   |   8 -
 res/values-hi/cm_strings.xml                       |   8 -
 res/values-hr/cm_strings.xml                       |   8 -
 res/values-hu/cm_strings.xml                       |   8 -
 res/values-in/cm_strings.xml                       |   8 -
 res/values-it/cm_strings.xml                       |   8 -
 res/values-iw/cm_strings.xml                       |   8 -
 res/values-ja/cm_strings.xml                       |   8 -
 res/values-kn-rIN/cm_strings.xml                   |   8 -
 res/values-ko/cm_strings.xml                       |   8 -
 res/values-ku/cm_strings.xml                       |   7 -
 res/values-lb/cm_strings.xml                       |   8 -
 res/values-lt/cm_strings.xml                       |   8 -
 res/values-lv/cm_strings.xml                       |   5 -
 res/values-ml-rIN/cm_strings.xml                   |   8 -
 res/values-mr-rIN/cm_strings.xml                   |   8 -
 res/values-nb/cm_strings.xml                       |   8 -
 res/values-nl/cm_strings.xml                       |   8 -
 res/values-or-rIN/cm_strings.xml                   |   8 -
 res/values-pl/cm_strings.xml                       |   8 -
 res/values-pt-rBR/cm_strings.xml                   |   8 -
 res/values-pt-rPT/cm_strings.xml                   |   8 -
 res/values-ro/cm_strings.xml                       |   8 -
 res/values-ru/cm_strings.xml                       |   8 -
 res/values-si-rLK/cm_strings.xml                   |   5 -
 res/values-sk/cm_strings.xml                       |   8 -
 res/values-sl/cm_strings.xml                       |   8 -
 res/values-sr/cm_strings.xml                       |   8 -
 res/values-sv/cm_strings.xml                       |   8 -
 res/values-ta-rIN/cm_strings.xml                   |   8 -
 res/values-te-rIN/cm_strings.xml                   |   8 -
 res/values-th/cm_strings.xml                       |   8 -
 res/values-tr/cm_strings.xml                       |   8 -
 res/values-ug/cm_strings.xml                       |   8 -
 res/values-uk/cm_strings.xml                       |   8 -
 res/values-vi/cm_strings.xml                       |   8 -
 res/values-zh-rCN/cm_strings.xml                   |   8 -
 res/values-zh-rHK/cm_strings.xml                   |   8 -
 res/values-zh-rTW/cm_strings.xml                   |   8 -
 res/values/cm_arrays.xml                           |   7 -
 res/values/cm_colors.xml                           |   4 -
 res/values/cm_strings.xml                          |  19 -
 res/values/config.xml                              |  36 -
 src/com/android/display/IPPService.aidl            |   7 -
 src/com/android/settings/CustomScreenColor.java    | 721 ---------------------
 src/com/android/settings/DisplaySettings.java      |   2 -
 src/com/android/settings/ScreenColorSettings.java  | 269 --------
 114 files changed, 2417 deletions(-)
 delete mode 100644 res/drawable-hdpi/btn_default.9.png
 delete mode 100644 res/drawable-hdpi/btn_default_disabled.9.png
 delete mode 100644 res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png
 delete mode 100644 res/drawable-hdpi/btn_default_focused_holo_dark.9.png
 delete mode 100644 res/drawable-hdpi/btn_default_pressed_holo_dark.9.png
 delete mode 100644 res/drawable-hdpi/default_screencolor_setting.png
 delete mode 100644 res/drawable-hdpi/ic_down.png
 delete mode 100644 res/drawable-hdpi/ic_down_pressed.png
 delete mode 100644 res/drawable-hdpi/ic_more_default.png
 delete mode 100644 res/drawable-hdpi/ic_more_pressed.png
 delete mode 100644 res/drawable-hdpi/ic_new_default.png
 delete mode 100644 res/drawable-hdpi/ic_new_dis.png
 delete mode 100644 res/drawable-hdpi/ic_new_glow.png
 delete mode 100644 res/drawable-hdpi/ic_new_pressed.png
 delete mode 100644 res/drawable-hdpi/ic_previous_default.png
 delete mode 100644 res/drawable-hdpi/ic_previous_dis.png
 delete mode 100644 res/drawable-hdpi/ic_previous_glow.png
 delete mode 100644 res/drawable-hdpi/ic_previous_pressed.png
 delete mode 100644 res/drawable-hdpi/ic_up.png
 delete mode 100644 res/drawable-hdpi/ic_up_pressed.png
 delete mode 100644 res/drawable-hdpi/ic_zoom_in_holo_dark.png
 delete mode 100644 res/drawable-hdpi/ic_zoom_in_holo_light.png
 delete mode 100644 res/drawable-hdpi/ic_zoom_out_holo_dark.png
 delete mode 100644 res/drawable-hdpi/ic_zoom_out_holo_light.png
 delete mode 100644 res/drawable-hdpi/ic_zoom_slider.png
 delete mode 100644 res/drawable-hdpi/scrubber_track_holo_dark.9.png
 delete mode 100644 res/drawable/down_button.xml
 delete mode 100644 res/drawable/ic_zoom_in.xml
 delete mode 100644 res/drawable/ic_zoom_out.xml
 delete mode 100644 res/drawable/more_button.xml
 delete mode 100644 res/drawable/new_button.xml
 delete mode 100644 res/drawable/new_glow_button.xml
 delete mode 100644 res/drawable/previous_button.xml
 delete mode 100644 res/drawable/previous_glow_button.xml
 delete mode 100644 res/drawable/screencolor_btn.xml
 delete mode 100644 res/drawable/seekbar_define_style.xml
 delete mode 100644 res/drawable/up_button.xml
 delete mode 100644 res/layout/custom_screencolor.xml
 delete mode 100644 res/layout/screen_color_item.xml
 delete mode 100644 res/layout/screencolor_settings.xml
 delete mode 100644 res/menu/screencolor_more.xml
 delete mode 100644 src/com/android/display/IPPService.aidl
 delete mode 100644 src/com/android/settings/CustomScreenColor.java
 delete mode 100644 src/com/android/settings/ScreenColorSettings.java

diff --git a/Android.mk b/Android.mk
index db32ed1..78c561c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,9 +17,6 @@ LOCAL_SRC_FILES := \
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_SRC_FILES += \
-        src/com/android/display/IPPService.aidl
-
 LOCAL_PACKAGE_NAME := Settings
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ed8d6ed..700c93c 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -98,16 +98,6 @@
             android:allowBackup="false"
             android:usesCleartextTraffic="true">
 
-        <!-- Screen color Settings Controls -->
-        <activity android:name=".ScreenColorSettings" android:label="@string/screencolor"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="nosensor">
-        </activity>
-        <activity android:name=".CustomScreenColor" android:label="@string/custom_screencolor"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="nosensor">
-        </activity>
-
         <activity android:name="Settings"
                 android:taskAffinity="com.android.settings"
                 android:label="@string/settings_label_launcher"
diff --git a/res/drawable-hdpi/btn_default.9.png b/res/drawable-hdpi/btn_default.9.png
deleted file mode 100644
index a82048e..0000000
Binary files a/res/drawable-hdpi/btn_default.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_default_disabled.9.png b/res/drawable-hdpi/btn_default_disabled.9.png
deleted file mode 100644
index 45fa090..0000000
Binary files a/res/drawable-hdpi/btn_default_disabled.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png b/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png
deleted file mode 100644
index 13ab8f7..0000000
Binary files a/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_default_focused_holo_dark.9.png b/res/drawable-hdpi/btn_default_focused_holo_dark.9.png
deleted file mode 100644
index fee599a..0000000
Binary files a/res/drawable-hdpi/btn_default_focused_holo_dark.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png b/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png
deleted file mode 100644
index baf7018..0000000
Binary files a/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/default_screencolor_setting.png b/res/drawable-hdpi/default_screencolor_setting.png
deleted file mode 100644
index 90de65d..0000000
Binary files a/res/drawable-hdpi/default_screencolor_setting.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_down.png b/res/drawable-hdpi/ic_down.png
deleted file mode 100644
index f2ae375..0000000
Binary files a/res/drawable-hdpi/ic_down.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_down_pressed.png b/res/drawable-hdpi/ic_down_pressed.png
deleted file mode 100644
index 4646056..0000000
Binary files a/res/drawable-hdpi/ic_down_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_more_default.png b/res/drawable-hdpi/ic_more_default.png
deleted file mode 100644
index b05d204..0000000
Binary files a/res/drawable-hdpi/ic_more_default.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_more_pressed.png b/res/drawable-hdpi/ic_more_pressed.png
deleted file mode 100644
index 30ef4f3..0000000
Binary files a/res/drawable-hdpi/ic_more_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_new_default.png b/res/drawable-hdpi/ic_new_default.png
deleted file mode 100644
index 24f96f3..0000000
Binary files a/res/drawable-hdpi/ic_new_default.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_new_dis.png b/res/drawable-hdpi/ic_new_dis.png
deleted file mode 100644
index 2454ced..0000000
Binary files a/res/drawable-hdpi/ic_new_dis.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_new_glow.png b/res/drawable-hdpi/ic_new_glow.png
deleted file mode 100644
index 201ec86..0000000
Binary files a/res/drawable-hdpi/ic_new_glow.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_new_pressed.png b/res/drawable-hdpi/ic_new_pressed.png
deleted file mode 100644
index 4f0c46a..0000000
Binary files a/res/drawable-hdpi/ic_new_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_previous_default.png b/res/drawable-hdpi/ic_previous_default.png
deleted file mode 100644
index a84990e..0000000
Binary files a/res/drawable-hdpi/ic_previous_default.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_previous_dis.png b/res/drawable-hdpi/ic_previous_dis.png
deleted file mode 100644
index aea14f3..0000000
Binary files a/res/drawable-hdpi/ic_previous_dis.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_previous_glow.png b/res/drawable-hdpi/ic_previous_glow.png
deleted file mode 100644
index ec83882..0000000
Binary files a/res/drawable-hdpi/ic_previous_glow.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_previous_pressed.png b/res/drawable-hdpi/ic_previous_pressed.png
deleted file mode 100644
index 75af0be..0000000
Binary files a/res/drawable-hdpi/ic_previous_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_up.png b/res/drawable-hdpi/ic_up.png
deleted file mode 100644
index 2d51f39..0000000
Binary files a/res/drawable-hdpi/ic_up.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_up_pressed.png b/res/drawable-hdpi/ic_up_pressed.png
deleted file mode 100644
index ee03700..0000000
Binary files a/res/drawable-hdpi/ic_up_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_zoom_in_holo_dark.png b/res/drawable-hdpi/ic_zoom_in_holo_dark.png
deleted file mode 100644
index 89b5f15..0000000
Binary files a/res/drawable-hdpi/ic_zoom_in_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_zoom_in_holo_light.png b/res/drawable-hdpi/ic_zoom_in_holo_light.png
deleted file mode 100644
index 9751ca3..0000000
Binary files a/res/drawable-hdpi/ic_zoom_in_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_zoom_out_holo_dark.png b/res/drawable-hdpi/ic_zoom_out_holo_dark.png
deleted file mode 100644
index f4a2589..0000000
Binary files a/res/drawable-hdpi/ic_zoom_out_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_zoom_out_holo_light.png b/res/drawable-hdpi/ic_zoom_out_holo_light.png
deleted file mode 100644
index ba094ac..0000000
Binary files a/res/drawable-hdpi/ic_zoom_out_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_zoom_slider.png b/res/drawable-hdpi/ic_zoom_slider.png
deleted file mode 100644
index 8427e4d..0000000
Binary files a/res/drawable-hdpi/ic_zoom_slider.png and /dev/null differ
diff --git a/res/drawable-hdpi/scrubber_track_holo_dark.9.png b/res/drawable-hdpi/scrubber_track_holo_dark.9.png
deleted file mode 100644
index 0c0ccda..0000000
Binary files a/res/drawable-hdpi/scrubber_track_holo_dark.9.png and /dev/null differ
diff --git a/res/drawable/down_button.xml b/res/drawable/down_button.xml
deleted file mode 100644
index 29dbf42..0000000
--- a/res/drawable/down_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_down_pressed" />
-    <item android:drawable="@drawable/ic_down" />
-</selector>
diff --git a/res/drawable/ic_zoom_in.xml b/res/drawable/ic_zoom_in.xml
deleted file mode 100644
index 3a10ff1..0000000
--- a/res/drawable/ic_zoom_in.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:drawable="@drawable/ic_zoom_in_holo_light" />
-    <item android:state_pressed="true" android:drawable="@drawable/ic_zoom_in_holo_light" />
-    <item android:drawable="@drawable/ic_zoom_in_holo_dark" />
-</selector>
diff --git a/res/drawable/ic_zoom_out.xml b/res/drawable/ic_zoom_out.xml
deleted file mode 100644
index 070cffd..0000000
--- a/res/drawable/ic_zoom_out.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:drawable="@drawable/ic_zoom_out_holo_light" />
-    <item android:state_pressed="true" android:drawable="@drawable/ic_zoom_out_holo_light" />
-    <item android:drawable="@drawable/ic_zoom_out_holo_dark" />
-</selector>
diff --git a/res/drawable/more_button.xml b/res/drawable/more_button.xml
deleted file mode 100644
index bbad9d4..0000000
--- a/res/drawable/more_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_more_pressed" />
-    <item android:drawable="@drawable/ic_more_default" />
-</selector>
diff --git a/res/drawable/new_button.xml b/res/drawable/new_button.xml
deleted file mode 100644
index 4ed9daf..0000000
--- a/res/drawable/new_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_new_pressed" />
-    <item android:drawable="@drawable/ic_new_default" />
-</selector>
diff --git a/res/drawable/new_glow_button.xml b/res/drawable/new_glow_button.xml
deleted file mode 100644
index 506d8cf..0000000
--- a/res/drawable/new_glow_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_new_pressed" />
-    <item android:drawable="@drawable/ic_new_glow" />
-</selector>
diff --git a/res/drawable/previous_button.xml b/res/drawable/previous_button.xml
deleted file mode 100644
index ab7317b..0000000
--- a/res/drawable/previous_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_previous_pressed" />
-    <item android:drawable="@drawable/ic_previous_default" />
-</selector>
diff --git a/res/drawable/previous_glow_button.xml b/res/drawable/previous_glow_button.xml
deleted file mode 100644
index 1e896c6..0000000
--- a/res/drawable/previous_glow_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_previous_pressed" />
-    <item android:drawable="@drawable/ic_previous_glow" />
-</selector>
diff --git a/res/drawable/screencolor_btn.xml b/res/drawable/screencolor_btn.xml
deleted file mode 100644
index d89ae58..0000000
--- a/res/drawable/screencolor_btn.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/btn_default" />
-    <item android:state_window_focused="false" android:state_enabled="false"
-        android:drawable="@drawable/btn_default_disabled" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/btn_default_pressed_holo_dark" />
-    <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/btn_default_focused_holo_dark" />
-    <item android:state_enabled="true"
-        android:drawable="@drawable/btn_default" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/btn_default_disabled_focused_holo_dark" />
-    <item
-         android:drawable="@drawable/btn_default_disabled" />
-</selector>
diff --git a/res/drawable/seekbar_define_style.xml b/res/drawable/seekbar_define_style.xml
deleted file mode 100644
index 1d097b1..0000000
--- a/res/drawable/seekbar_define_style.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
- <layer-list  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+android:id/background" android:drawable="@drawable/scrubber_track_holo_dark" />
-    <item android:id="@+android:id/secondaryProgress" android:drawable="@drawable/scrubber_track_holo_dark" />
-    <item android:id="@+android:id/progress" android:drawable="@drawable/scrubber_track_holo_dark" />
-</layer-list>
diff --git a/res/drawable/up_button.xml b/res/drawable/up_button.xml
deleted file mode 100644
index 6f33a56..0000000
--- a/res/drawable/up_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_up_pressed" />
-    <item android:drawable="@drawable/ic_up" />
-</selector>
diff --git a/res/layout/custom_screencolor.xml b/res/layout/custom_screencolor.xml
deleted file mode 100644
index b6c153b..0000000
--- a/res/layout/custom_screencolor.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/background_preview"
-    android:background="@drawable/default_screencolor_setting">
-
-    <LinearLayout
-        android:id="@+id/bottons_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="center_horizontal|bottom"
-        style="?android:attr/buttonBarStyle">
-        <Button
-            android:id="@+id/cancel"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:textColor="@color/custom_screencolor_buttons_text_color"
-            android:text="@string/screencolor_cancel"
-            android:background="@drawable/screencolor_btn"/>
-        <Button
-            android:id="@+id/save"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:textColor="@color/custom_screencolor_buttons_text_color"
-            android:text="@string/screencolor_save"
-            android:background="@drawable/screencolor_btn"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/controls_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/bottons_layout"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
-        android:background="@drawable/transparent_background">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center">
-                <ImageView
-                    android:id="@+id/up_down"
-                    android:layout_width="48dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/down_button"/>
-                <ImageView
-                    android:id="@+id/more"
-                    android:layout_width="48dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/more_button"/>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/up_down"
-                    android:layout_toLeftOf="@id/more"
-                    android:gravity="center">
-                    <Button
-                        android:id="@+id/previous_btn"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/previous_button"/>
-                    <Button
-                        android:id="@+id/new_btn"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/new_button"/>
-                </LinearLayout>
-            </RelativeLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/preview_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/controls_layout"
-        android:paddingLeft="20dip"
-        android:paddingRight="20dip"
-        android:paddingBottom="10dip">
-        <LinearLayout android:id="@+id/screencolor_control"
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-            <TextView android:id="@+id/hue"
-                android:layout_height="wrap_content"
-                android:paddingLeft="20dip"
-                android:paddingTop="10dip"
-                android:layout_width="match_parent"
-                android:textColor="@color/custom_screencolor_buttons_text_color"
-                android:text="@string/hue_str"/>
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="10dip"
-                android:paddingRight="10dip">
-                <ImageView
-                    android:id="@+id/reduce_hue"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ic_zoom_out"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"/>
-                <ImageView
-                    android:id="@+id/increase_hue"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ic_zoom_in"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"/>
-                <SeekBar android:id="@+id/hcontrol"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:thumb="@drawable/ic_zoom_slider"
-                    android:progressDrawable="@drawable/seekbar_define_style"
-                    android:layout_toRightOf="@id/reduce_hue"
-                    android:layout_toLeftOf="@id/increase_hue"
-                    android:maxHeight="12px"
-                    android:minHeight="12px"
-                    android:paddingLeft="20dip"
-                    android:paddingTop="10dip"
-                    android:paddingRight="20dip"
-                    android:paddingBottom="10dip"/>
-            </RelativeLayout>
-
-            <TextView android:id="@+id/saturation"
-                android:layout_height="wrap_content"
-                android:paddingLeft="20dip"
-                android:paddingTop="10dip"
-                android:layout_width="fill_parent"
-                android:textColor="@color/custom_screencolor_buttons_text_color"
-                android:text="@string/saturation_str"/>
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="10dip"
-                android:paddingRight="10dip">
-                <ImageView
-                    android:id="@+id/reduce_saturation"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_out"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true" />
-                <ImageView
-                    android:id="@+id/increase_saturation"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_in"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"/>
-                <SeekBar android:id="@+id/scontrol"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:thumb="@drawable/ic_zoom_slider"
-                    android:progressDrawable="@drawable/seekbar_define_style"
-                    android:layout_toRightOf="@id/reduce_saturation"
-                    android:layout_toLeftOf="@id/increase_saturation"
-                    android:paddingLeft="20dip"
-                    android:paddingTop="10dip"
-                    android:paddingRight="20dip"
-                    android:paddingBottom="10dip"/>
-            </RelativeLayout>
-
-            <TextView android:id="@+id/contrast"
-                android:layout_height="wrap_content"
-                android:paddingLeft="20dip"
-                android:paddingTop="10dip"
-                android:layout_width="fill_parent"
-                android:textColor="@color/custom_screencolor_buttons_text_color"
-                android:text="@string/contrast_str"/>
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="10dip"
-                android:paddingRight="10dip">
-                <ImageView
-                    android:id="@+id/reduce_contrast"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_out"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true" />
-                <ImageView
-                    android:id="@+id/increase_contrast"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_in"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"/>
-                <SeekBar android:id="@+id/ccontrol"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:thumb="@drawable/ic_zoom_slider"
-                    android:progressDrawable="@drawable/seekbar_define_style"
-                    android:layout_toRightOf="@id/reduce_contrast"
-                    android:layout_toLeftOf="@id/increase_contrast"
-                    android:paddingLeft="20dip"
-                    android:paddingTop="10dip"
-                    android:paddingRight="20dip"
-                    android:paddingBottom="10dip"/>
-            </RelativeLayout>
-
-            <TextView android:id="@+id/intensity"
-                android:layout_height="wrap_content"
-                android:paddingLeft="20dip"
-                android:paddingTop="10dip"
-                android:layout_width="fill_parent"
-                android:textColor="@color/custom_screencolor_buttons_text_color"
-                android:text="@string/intensity_str"/>
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="10dip"
-                android:paddingRight="10dip"
-                android:id="@+id/intensity_layout">
-                <ImageView
-                    android:id="@+id/reduce_intensity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_out"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true" />
-                <ImageView
-                    android:id="@+id/increase_intensity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_in"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"/>
-                <SeekBar android:id="@+id/icontrol"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:thumb="@drawable/ic_zoom_slider"
-                    android:progressDrawable="@drawable/seekbar_define_style"
-                    android:layout_toRightOf="@id/reduce_intensity"
-                    android:layout_toLeftOf="@id/increase_intensity"
-                    android:paddingLeft="20dip"
-                    android:paddingTop="10dip"
-                    android:paddingRight="20dip"
-                    android:paddingBottom="10dip"/>
-            </RelativeLayout>
-        </LinearLayout>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/res/layout/screen_color_item.xml b/res/layout/screen_color_item.xml
deleted file mode 100644
index 7a87284..0000000
--- a/res/layout/screen_color_item.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="10dip"
-    android:paddingTop="4dip"
-    android:paddingRight="10dip"
-    android:paddingBottom="4dip" >
-
-    <RelativeLayout
-        android:id="@+id/widget_frame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/divider"
-        android:clickable="true"
-        android:focusable="true"
-        android:paddingLeft="10dip" >
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@android:id/button1"
-            android:layout_toEndOf="@android:id/icon"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textAlignment="viewStart"
-            android:textColor="@color/screen_color_button_text_color"
-            android:labelFor="@android:id/button2" />
-
-        <RadioButton
-            android:id="@android:id/button1"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:duplicateParentState="true"
-            android:clickable="false"
-            android:focusable="false" />
-    </RelativeLayout>
-
-    <ImageView
-        android:id="@id/divider"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:layout_toStartOf="@android:id/button2"
-        android:src="@drawable/nav_divider" />
-
-    <ImageView
-        android:id="@android:id/button2"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@android:id/widget_frame"
-        android:layout_alignParentEnd="true"
-        android:layout_alignTop="@android:id/widget_frame"
-        android:layout_centerVertical="true"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/ic_bt_config" />
-
-</RelativeLayout>
diff --git a/res/layout/screencolor_settings.xml b/res/layout/screencolor_settings.xml
deleted file mode 100644
index dd614a1..0000000
--- a/res/layout/screencolor_settings.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/background_preview"
-    android:orientation="vertical"
-    android:gravity="bottom"
-    android:background="@drawable/default_screencolor_setting">
-
-
-        <ListView
-            android:id="@+id/mode_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
-            android:layout_marginBottom="20dip"
-            android:layout_gravity="bottom"
-            android:background="@drawable/transparent_background" >
-        </ListView>
-</LinearLayout>
diff --git a/res/menu/screencolor_more.xml b/res/menu/screencolor_more.xml
deleted file mode 100644
index dc914b4..0000000
--- a/res/menu/screencolor_more.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/restore_preview"
-        android:title="@string/restore_preview"
-    />
-    <item
-        android:id="@+id/selectnewfile_menu"
-        android:title="@string/selectnewfile_menu"
-    />
-    <item
-        android:id="@+id/selectfile_menu"
-        android:title="@string/selectfile_menu"
-    />
-    <item
-        android:id="@+id/restore_default_str"
-        android:title="@string/restore_default_str"
-    />
-</menu>
diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 9bba2f8..459e101 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -570,11 +570,6 @@
   <string name="display_rotation_180_title">180 grade</string>
   <string name="display_rotation_270_title">270 grade</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Skerm kleur</string>
-  <string name="screencolor_summary">Verander skerm kleur, versadiging, kontras of intensiteit</string>
-  <string name="custom_screencolor">Persoonlike skerm kleur</string>
-  <string name="screencolor_save">Stoor</string>
-  <string name="screencolor_cancel">Kanselleer</string>
   <string name="restore_preview">Vertoon standaard foto</string>
   <string name="selectnewfile_menu">Vertoon nuwe foto van Galery</string>
   <string name="selectfile_menu">Vertoon foto vanuit Galery</string>
@@ -583,9 +578,6 @@
   <string name="saturation_str">Versadiging: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontras: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiteit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standaard</string>
-  <string name="screen_color_vivid">Lewendig</string>
-  <string name="screen_color_custom">Persoonlik</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimaliseer jou skerm gebaseer op die tyd van die dag en die omringende omstandighede om leesbaarheid te verbeter en verminder oogspanning</string>
   <string name="live_display_mode">Skerm modus</string>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 6c86d3c..2e9b70a 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -576,11 +576,6 @@
   <string name="display_rotation_180_title">180 درجة</string>
   <string name="display_rotation_270_title">270 درجة</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">لون الشاشة</string>
-  <string name="screencolor_summary">ضبط لون شاشة أو مستوى التشبع أو التباين أو الكثافة</string>
-  <string name="custom_screencolor">لون الشاشة المخصص</string>
-  <string name="screencolor_save">حفظ</string>
-  <string name="screencolor_cancel">الغاء</string>
   <string name="restore_preview">عرض الصورة المبدئيّة</string>
   <string name="selectnewfile_menu">عرض صورة جديدة من معرض الصور</string>
   <string name="selectfile_menu">عرض صورة من معرض الصور</string>
@@ -589,9 +584,6 @@
   <string name="saturation_str">التشبع: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">التباين: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">الكثافة: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">قياسى</string>
-  <string name="screen_color_vivid">حي</string>
-  <string name="screen_color_custom">مخصص</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">تحسين الشاشة بحسب الوقت من اليوم والظروف المحيطة لتسهيل القراءة وتقليل إجهاد العين</string>
   <string name="live_display_mode">نمط العرض</string>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 5d98cc3..bcef602 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 ডিগ্ৰী</string>
   <string name="display_rotation_270_title">270 ডিগ্ৰী</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">স্ক্ৰীণৰ ৰং</string>
-  <string name="screencolor_summary">স্ক্ৰীণৰ হিউ, সংপৃক্ততা, বিষমতা আৰু তীব্ৰতা টিউন কৰক</string>
-  <string name="custom_screencolor">কাষ্টম স্ক্ৰীণ ৰং</string>
-  <string name="screencolor_save">ছেভ কৰা</string>
-  <string name="screencolor_cancel">নাকচ</string>
   <string name="restore_preview">ডিফ\'ল্ট ছবি চাওক</string>
   <string name="selectnewfile_menu">গেলাৰীৰ পৰা নতুন ছবি চাওক</string>
   <string name="selectfile_menu">গেলাৰীৰ পৰা ছবি চাওক</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">ৰঙৰ গাঢ়তা: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">বিষমতা: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">তীব্ৰতা: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">ষ্টেণ্ডাৰ্ড</string>
-  <string name="screen_color_vivid">উজ্জ্বল</string>
-  <string name="screen_color_custom">কাষ্টম</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">পঠনযোগ্যতা আৰু চকুৰ ওপৰত চাপ হ্ৰাস কৰিবলৈ দিনৰ সময়ৰ আধাৰত আপোনাৰ স্ক্ৰীণ আৰু পাৰিপাৰ্শ্বিক অৱস্থা অপ্টিমাইজ কৰক</string>
   <string name="live_display_mode">প্রদর্শন মোড</string>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 1ae73ea..61c53b8 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -567,11 +567,6 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="display_rotation_180_title">180 graos</string>
   <string name="display_rotation_270_title">270 graos</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Color de la pantalla</string>
-  <string name="screencolor_summary">Axustar el tonu de la pantalla, saturación, contraste o intensidá</string>
-  <string name="custom_screencolor">Color personalizáu de la pantalla</string>
-  <string name="screencolor_save">Guardar</string>
-  <string name="screencolor_cancel">Encaboxar</string>
   <string name="restore_preview">Ver imaxe por defeutu</string>
   <string name="selectnewfile_menu">Ver imaxe nueva dende la Galería</string>
   <string name="selectfile_menu">Ver imaxe dende la Galería</string>
@@ -580,9 +575,6 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidá: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Estándar</string>
-  <string name="screen_color_vivid">Intensu</string>
-  <string name="screen_color_custom">Por defeutu</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiza la to pantalla basándose na hora\'l día y les condiciones ambientales p\'ameyorar la llexibilidá y amenorgar el cansanciu de güeyos</string>
   <string name="live_display_color_temperature_title">Temperatura de color</string>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 4153728..a009f8b 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -470,11 +470,6 @@
   <string name="display_rotation_180_title">180 dərəcə</string>
   <string name="display_rotation_270_title">270 dərəcə</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekran rəngi</string>
-  <string name="screencolor_summary">Ekran rəng çalarını, doydurmanı, təzadını və gərginliyini tənzimlə</string>
-  <string name="custom_screencolor">Xüsusi ekran rəngi</string>
-  <string name="screencolor_save">Saxla</string>
-  <string name="screencolor_cancel">İmtina</string>
   <string name="restore_preview">İlkin şəklə bax</string>
   <string name="selectnewfile_menu">Qalereyadan yeni şəklə bax</string>
   <string name="selectfile_menu">Qalereyadan şəklə bax</string>
@@ -483,9 +478,6 @@
   <string name="saturation_str">Doydurma: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Təzad: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Gərginlik: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standart</string>
-  <string name="screen_color_vivid">Canlı</string>
-  <string name="screen_color_custom">Xüsusi</string>
   <!-- LiveDisplay -->
   <string name="live_display_day">Gündüz</string>
   <string name="live_display_night">Gecə</string>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 76a79c0..200c969 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -570,11 +570,6 @@
   <string name="display_rotation_180_title">180 градусаў</string>
   <string name="display_rotation_270_title">270 градусаў</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Колераперадача экрана</string>
-  <string name="screencolor_summary">Налада адцення, роўняў насычанасці і кантраснасці экрана</string>
-  <string name="custom_screencolor">Карыстальніцкая колераперадача</string>
-  <string name="screencolor_save">Захаваць</string>
-  <string name="screencolor_cancel">Скасаванне</string>
   <string name="restore_preview">Стандартны значок</string>
   <string name="selectnewfile_menu">Абраць новую выяву з \"Галерэі\"</string>
   <string name="selectfile_menu">Абраць з \"Галерэі\"</string>
@@ -583,9 +578,6 @@
   <string name="saturation_str">Насычанасць: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Кантраснасць: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Інтэнсіўнасць: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Стандартны</string>
-  <string name="screen_color_vivid">Яскравы</string>
-  <string name="screen_color_custom">Уласная</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Падладжваць экран на аснове часу сутак і асвятлення, каб палепшыць чытальнасць і зменшыць стомленасць вачэй</string>
   <string name="live_display_mode">Рэжым экрана</string>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 6e7e463..fe656ec 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 градуса</string>
   <string name="display_rotation_270_title">270 градуса</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Цвят на екрана</string>
-  <string name="screencolor_summary">Настройване на отенъка, наситеността, контраста или интензитета на екрана</string>
-  <string name="custom_screencolor">Персонализиран цвят на екрана</string>
-  <string name="screencolor_save">Запиши</string>
-  <string name="screencolor_cancel">Отказ</string>
   <string name="restore_preview">Изглед на картините по подразбиране</string>
   <string name="selectnewfile_menu">Виж нова снимка от галерията</string>
   <string name="selectfile_menu">Виж снимка от галерията</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Наситеност: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s </xliff:g></string>
   <string name="intensity_str">Интензитет: <xliff:g id="intensity_str_value">%1$s </xliff:g></string>
-  <string name="screen_color_standard">Стандартен</string>
-  <string name="screen_color_vivid">Ярък</string>
-  <string name="screen_color_custom">По избор</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Оптимизира настройките на екрана, въз основа на времето от деня и условията на околната среда за да се подобри четливостта и да намали умората на очите</string>
   <string name="live_display_mode">Режим на екрана</string>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 552af91..40f1258 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -378,10 +378,6 @@
   <string name="display_rotation_180_title">১৮০ ডিগ্রী</string>
   <string name="display_rotation_270_title">২৭০ ডিগ্রী</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">পর্দার রঙ</string>
-  <string name="custom_screencolor">পছন্দসই পর্দার রঙ</string>
-  <string name="screencolor_save">সংরক্ষণ</string>
-  <string name="screencolor_cancel">বাতিল</string>
   <string name="restore_preview">পূর্ব-নির্ধারিত চিত্র প্রদর্শন</string>
   <string name="selectnewfile_menu">গ্যালারী থেকে নতুন চিত্র প্রদর্শন</string>
   <string name="selectfile_menu">গ্যালারী থেকে চিত্র প্রদর্শন</string>
@@ -390,7 +386,6 @@
   <string name="saturation_str">সম্পৃক্তিঃ <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">বৈপরীত্যঃ <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">তীব্রতাঃ <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_custom">পছন্দসই</string>
   <!-- LiveDisplay -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 7b5a7b0..a8bca0c 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 graus</string>
   <string name="display_rotation_270_title">270 graus</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Color de la pantalla</string>
-  <string name="screencolor_summary">Ajusta el matís, la saturació, el contrast o la intensitat de la pantalla</string>
-  <string name="custom_screencolor">Color de pantalla personalitzat</string>
-  <string name="screencolor_save">Desa</string>
-  <string name="screencolor_cancel">Cancel·la</string>
   <string name="restore_preview">Mostra la imatge per defecte</string>
   <string name="selectnewfile_menu">Mostra una nova imatge des de la galeria</string>
   <string name="selectfile_menu">Mostra una imatge des de la galeria</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Saturació: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitat: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Estàndard</string>
-  <string name="screen_color_vivid">Viva</string>
-  <string name="screen_color_custom">Personalitzat</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimitza la teva pantalla basant-se en l\'hora del dia i les condicions ambientals per millorar la llegibilitat i reduir la fatiga ocular</string>
   <string name="live_display_mode">Mode de pantalla</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 3d41c4f..12dbaec 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 stupňů</string>
   <string name="display_rotation_270_title">270 stupňů</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Barvy obrazovky</string>
-  <string name="screencolor_summary">Upravit odstín, sytost, kontrast nebo intenzitu obrazovky</string>
-  <string name="custom_screencolor">Vlastní barvy obrazovky</string>
-  <string name="screencolor_save">Uložit</string>
-  <string name="screencolor_cancel">Zrušit</string>
   <string name="restore_preview">Zobrazit výchozí obrázek</string>
   <string name="selectnewfile_menu">Zobrazit nový obrázek z Galerie</string>
   <string name="selectfile_menu">Zobrazit obrázek z Galerie</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Sytost: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenzita: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standardní</string>
-  <string name="screen_color_vivid">Živé</string>
-  <string name="screen_color_custom">Vlastní</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizovat obrazovku podle denní doby a okolních podmínek pro lepší čitelnost a snížení namáhání očí</string>
   <string name="live_display_mode">Režim zobrazení</string>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index a4e4f09..803d1a0 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -566,11 +566,6 @@
   <string name="display_rotation_180_title">180 grader</string>
   <string name="display_rotation_270_title">270 grader</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Skærmfarve</string>
-  <string name="screencolor_summary">Indstil skærmens nuance, mætning, kontrast eller intensitet</string>
-  <string name="custom_screencolor">Tilpasset skærmfarve</string>
-  <string name="screencolor_save">Gem</string>
-  <string name="screencolor_cancel">Annuller</string>
   <string name="restore_preview">Vis standardbillede</string>
   <string name="selectnewfile_menu">Vis nyt billede fra Galleri</string>
   <string name="selectfile_menu">Vis billede fra Galleri</string>
@@ -579,9 +574,6 @@
   <string name="saturation_str">Farvemætning: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Levende</string>
-  <string name="screen_color_custom">Egen</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimér din skærm baseret på tidspunktet på dagen, samt omgivelserne, for at forbedre læsbarheden og nedsætte anstrengelsen af øjnene</string>
   <string name="live_display_mode">Visningstilstand</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 5648b4f..22c8e05 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 Grad</string>
   <string name="display_rotation_270_title">270 Grad</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Bildschirmfarbe</string>
-  <string name="screencolor_summary">Farbton, Sättigung, Kontrast und Intensität des Bildschirms anpassen</string>
-  <string name="custom_screencolor">Benutzerdefinierte Bildschirmfarbe</string>
-  <string name="screencolor_save">Speichern</string>
-  <string name="screencolor_cancel">Abbrechen</string>
   <string name="restore_preview">Standardbild anzeigen</string>
   <string name="selectnewfile_menu">Neues Bild aus Galerie anzeigen</string>
   <string name="selectfile_menu">Bild aus Galerie anzeigen</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Sättigung: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensität: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Lebhaft</string>
-  <string name="screen_color_custom">Benutzerdefiniert</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiert Ihren Bildschirm basierend auf der Tageszeit und den Umgebungsbedingungen, um die Lesbarkeit zu verbessern und die Ermüdung der Augen zu mildern</string>
   <string name="live_display_mode">Bildschirmmodus</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 559e472..8da8728 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 μοίρες</string>
   <string name="display_rotation_270_title">270 μοίρες</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Χρώμα οθόνης</string>
-  <string name="screencolor_summary">Βελτιώστε την απόχρωση, τον κορεσμό, την αντίθεση ή την ένταση της οθόνης</string>
-  <string name="custom_screencolor">Προσαρμοσμένο χρώμα οθόνης</string>
-  <string name="screencolor_save">Αποθήκευση</string>
-  <string name="screencolor_cancel">Ακύρωση</string>
   <string name="restore_preview">Προβολή προεπιλεγμένης εικόνας</string>
   <string name="selectnewfile_menu">Προβολή νέας εικόνας από τη Συλλογή</string>
   <string name="selectfile_menu">Προβολή εικόνας από τη Συλλογή</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Κορεσμός: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Αντίθεση: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Ένταση: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Κανονικό</string>
-  <string name="screen_color_vivid">Ζωντανό</string>
-  <string name="screen_color_custom">Προσαρμοσμένο</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Βελτιστοποίηση της οθόνης σας με βάση την ώρα της ημέρας και τις συνθήκες περιβάλλοντος για βελτίωση της αναγνωσιμότητας και μείωση της καταπόνησης των ματιών</string>
   <string name="live_display_mode">Λειτουργία οθόνης</string>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 84a17b6..5782ae7 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -471,11 +471,6 @@
   <string name="display_rotation_180_title">180 degrees</string>
   <string name="display_rotation_270_title">270 degrees</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Screen colour</string>
-  <string name="screencolor_summary">Tune screen hue, saturation, contrast or intensity</string>
-  <string name="custom_screencolor">Custom screen colour</string>
-  <string name="screencolor_save">Save</string>
-  <string name="screencolor_cancel">Cancel</string>
   <string name="restore_preview">View default picture</string>
   <string name="selectnewfile_menu">View new picture from Gallery</string>
   <string name="selectfile_menu">View picture from Gallery</string>
@@ -484,9 +479,6 @@
   <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Vivid</string>
-  <string name="screen_color_custom">Custom</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
   <string name="live_display_mode">Display mode</string>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 528f0fb..de59be9 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -513,11 +513,6 @@
   <string name="display_rotation_180_title">180 degrees</string>
   <string name="display_rotation_270_title">270 degrees</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Screen color</string>
-  <string name="screencolor_summary">Tune screen hue, saturation, contrast or intensity</string>
-  <string name="custom_screencolor">Custom screen color</string>
-  <string name="screencolor_save">Save</string>
-  <string name="screencolor_cancel">Cancel</string>
   <string name="restore_preview">View default picture</string>
   <string name="selectnewfile_menu">View new picture from Gallery</string>
   <string name="selectfile_menu">View picture from Gallery</string>
@@ -526,9 +521,6 @@
   <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Vivid</string>
-  <string name="screen_color_custom">Custom</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
   <string name="live_display_mode">Display mode</string>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 3dbff19..1154fe6 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -496,11 +496,6 @@
   <string name="display_rotation_180_title">180 gradoj</string>
   <string name="display_rotation_270_title">270 gradoj</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekrana koloro</string>
-  <string name="screencolor_summary">Agordeti kolortonon, saturecon, kontraston aŭ intensecon</string>
-  <string name="custom_screencolor">Propra ekrana koloro</string>
-  <string name="screencolor_save">Konservi</string>
-  <string name="screencolor_cancel">Rezigni</string>
   <string name="restore_preview">Vidi defaŭltan bildon</string>
   <string name="selectnewfile_menu">Vidi defaŭltan bildon el la Galerio</string>
   <string name="selectfile_menu">Vidi bildon el la Galerio</string>
@@ -509,9 +504,6 @@
   <string name="saturation_str">Satureco: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrasto: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenseco: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Normala</string>
-  <string name="screen_color_vivid">Viva</string>
-  <string name="screen_color_custom">Propra</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimumigi vian ekranon laŭ la horo kaj la ĉirkaŭaĵa etoso por plibonigi la legebecon kaj malhelpi okulan malkomforton</string>
   <string name="live_display_mode">Vidiga reĝimo</string>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 184df08..9f1c3ba 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 grados</string>
   <string name="display_rotation_270_title">270 grados</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Color de pantalla</string>
-  <string name="screencolor_summary">Ajustar el matiz de la pantalla, saturación, contraste o intensidad</string>
-  <string name="custom_screencolor">Personalizar color de pantalla</string>
-  <string name="screencolor_save">Guardar</string>
-  <string name="screencolor_cancel">Cancelar</string>
   <string name="restore_preview">Ver imagen predeterminada</string>
   <string name="selectnewfile_menu">Ver nueva imagen desde la galería</string>
   <string name="selectfile_menu">Ver imagen desde la galería</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidad: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Estándar</string>
-  <string name="screen_color_vivid">Intenso</string>
-  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizar la pantalla según la hora del día y las condiciones ambientales para mejorar la legibilidad y reducir la fatiga visual</string>
   <string name="live_display_mode">Modo de visualización</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 847ef7c..eb6d50f 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 grados</string>
   <string name="display_rotation_270_title">270 grados</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Color de pantalla</string>
-  <string name="screencolor_summary">Ajustar el matiz de la pantalla, saturación, contraste o intensidad</string>
-  <string name="custom_screencolor">Personalizar color</string>
-  <string name="screencolor_save">Guardar</string>
-  <string name="screencolor_cancel">Cancelar</string>
   <string name="restore_preview">Mostrar imagen por defecto</string>
   <string name="selectnewfile_menu">Mostrar nueva imagen desde Galería</string>
   <string name="selectfile_menu">Mostrar imagen desde Galería</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidad: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Estándar</string>
-  <string name="screen_color_vivid">Intenso</string>
-  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizar la pantalla según la hora del día y las condiciones ambientales para mejorar la legibilidad y reducir la fatiga visual</string>
   <string name="live_display_mode">Modo de visualización</string>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 33b933c..e3c872f 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -504,11 +504,6 @@
   <string name="display_rotation_180_title">180 kraadi</string>
   <string name="display_rotation_270_title">270 kraadi</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekraani värv</string>
-  <string name="screencolor_summary">Häälesta värvus, küllastus, kontrast ja intensiivsus</string>
-  <string name="custom_screencolor">Kohandatud ekraani värv</string>
-  <string name="screencolor_save">Salvesta</string>
-  <string name="screencolor_cancel">Tühista</string>
   <string name="restore_preview">Kuva vaikepilt</string>
   <string name="selectnewfile_menu">Kuva uus pilti Galeriist</string>
   <string name="selectfile_menu">Kuva pilt Galeriist</string>
@@ -517,9 +512,6 @@
   <string name="saturation_str">Küllastus: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiivsus: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Ergas</string>
-  <string name="screen_color_custom">Kohandatud</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiseeri oma ekraan vastavalt päeva ajale ja ümbritsevatele tingimustele, et parandada loetavust ning vähendada silmade pinget</string>
   <string name="live_display_mode">Ekraani režiim</string>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 802e0e1..928ba1f 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 gradu</string>
   <string name="display_rotation_270_title">270 gradu</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Pantailaren kolorea</string>
-  <string name="screencolor_summary">Doitu pantailaren ñabardura, saturazioa, kontrastea edo intentsitatea</string>
-  <string name="custom_screencolor">Pertsonalizatutako pantaila kolorea</string>
-  <string name="screencolor_save">Gorde</string>
-  <string name="screencolor_cancel">Utzi</string>
   <string name="restore_preview">Ikusi lehenetsitako irudia</string>
   <string name="selectnewfile_menu">Ikusi irudi berria galeriatik</string>
   <string name="selectfile_menu">Ikusi irudia galeriatik</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Saturazioa:<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrastea:<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intentsitatea:<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Estandarra</string>
-  <string name="screen_color_vivid">Bizia</string>
-  <string name="screen_color_custom">Lehenetsia</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizatu zure pantaila eguneko orduaren eta inguruneko baldintzen arabera irakurgarritasuna hobetzeko eta begien nekea gutxiagotzeko</string>
   <string name="live_display_mode">Pantaila modua</string>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 87485a2..1938b5c 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -506,11 +506,6 @@
   <string name="display_rotation_180_title">۱۸۰ درجه</string>
   <string name="display_rotation_270_title">۲۷۰ درجه</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">رنگ صفحه</string>
-  <string name="screencolor_summary">تنظیم ته‌رنگ، اشباع، کنتراست یا شدت رنگ صفحه</string>
-  <string name="custom_screencolor">رنگ سفارشی صفحه</string>
-  <string name="screencolor_save">ذخیره</string>
-  <string name="screencolor_cancel">لغو</string>
   <string name="restore_preview">مشاهده تصویر پیش‌فرض</string>
   <string name="selectnewfile_menu">مشاهده تصویر جدید از گالری</string>
   <string name="selectfile_menu">مشاهده تصویر از گالری</string>
@@ -519,9 +514,6 @@
   <string name="saturation_str">اشباع: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">کنتراست: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">شدت رنگ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">استاندارد</string>
-  <string name="screen_color_vivid">واضح</string>
-  <string name="screen_color_custom">شخصی</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">بهینه کردن صفحه بر اساس ساعات روز و شرایط محیطی برای افزایش خوانایی و کاهش خستگی چشم</string>
   <string name="live_display_mode">حالت نمایش</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index c5597bf..3da6cf9 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 astetta</string>
   <string name="display_rotation_270_title">270 astetta</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Näytön väri</string>
-  <string name="screencolor_summary">Säädä näytön värisävyä, kontrastia ja intensiteettiä</string>
-  <string name="custom_screencolor">Mukautettu näytön väri</string>
-  <string name="screencolor_save">Tallenna</string>
-  <string name="screencolor_cancel">Peruuta</string>
   <string name="restore_preview">Näytä oletuskuva</string>
   <string name="selectnewfile_menu">Näytä uusi kuva Galleriasta</string>
   <string name="selectfile_menu">Katso kuva Galleriasta</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Kylläisyys: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrasti: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiteetti: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standardi</string>
-  <string name="screen_color_vivid">Eloisa</string>
-  <string name="screen_color_custom">Mukautettu</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimoi näyttösi kellonajan ja ympäristöolosuhteiden perusteella parantaaksesi luettavuutta ja vähentääksesi silmien rasitusta</string>
   <string name="live_display_mode">Näyttötila</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 014e9b8..5f49680 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -573,11 +573,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="display_rotation_180_title">180 degrés</string>
   <string name="display_rotation_270_title">270 degrés</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Couleur de l\'écran</string>
-  <string name="screencolor_summary">Régler la teinte, la saturation, le contraste ou l\'intensité de l\'écran</string>
-  <string name="custom_screencolor">Couleur d\'écran personnalisée</string>
-  <string name="screencolor_save">Enregistrer</string>
-  <string name="screencolor_cancel">Annuler</string>
   <string name="restore_preview">Afficher l\'image par défaut</string>
   <string name="selectnewfile_menu">Afficher la nouvelle image depuis la galerie</string>
   <string name="selectfile_menu">Afficher l\'image depuis la galerie</string>
@@ -586,9 +581,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="saturation_str">Saturation : <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste : <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensité : <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Vive</string>
-  <string name="screen_color_custom">Personnalisée</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiser votre écran en fonction de l\'heure et des conditions ambiantes pour améliorer la lisibilité et réduire la fatigue oculaire</string>
   <string name="live_display_mode">Mode d\'affichage</string>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index 74fa14a..89e6c6e 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -97,8 +97,6 @@
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor_save">Bewarje</string>
-  <string name="screencolor_cancel">Annulearje</string>
   <!-- LiveDisplay -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 0eec73e..650c191 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -570,11 +570,6 @@
   <string name="display_rotation_180_title">180 અંશ</string>
   <string name="display_rotation_270_title">270 અંશ</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">સ્ક્રીન રંગ</string>
-  <string name="screencolor_summary">સ્ક્રીનના રંગ, સંતૃપ્તિ, કૉન્ટ્રાસ્ટ અથવા તીવ્રતાને ટ્યુન કરો</string>
-  <string name="custom_screencolor">કસ્ટમ સ્ક્રીન રંગ</string>
-  <string name="screencolor_save">સાચવો</string>
-  <string name="screencolor_cancel">રદ કરો</string>
   <string name="restore_preview">ડિફૉલ્ટ ચિત્ર જુઓ</string>
   <string name="selectnewfile_menu">ગૅલરીમાંથી નવું ચિત્ર જુઓ</string>
   <string name="selectfile_menu">ગૅલરીમાંથી ચિત્ર જુઓ</string>
@@ -583,9 +578,6 @@
   <string name="saturation_str">સંતૃપ્તિ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">કૉન્ટ્રાસ્ટ: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ઉત્કટતા: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">પ્રમાણભૂત</string>
-  <string name="screen_color_vivid">વિવિધ</string>
-  <string name="screen_color_custom">કસ્ટમ</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">વાંચન ક્ષમતામાં સુધારો લાવવા અને આંખો પરનો તાણ ઘટાડવા દિવસનો સમય અને વ્યાપક હવામાનનાં આધારે તમારા સ્ક્રીનને અનુકૂળ બનાવો</string>
   <string name="live_display_mode">પ્રદર્શન મોડ</string>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 14ecdb5..c7d5258 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -502,11 +502,6 @@
   <string name="display_rotation_180_title">180 डिग्री</string>
   <string name="display_rotation_270_title">270 डिग्री</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">स्क्रीन का रंग</string>
-  <string name="screencolor_summary">स्क्रीन के रंग, संतृत्पि, कोंट्रास्ट या तीव्रता को समायोजित करें</string>
-  <string name="custom_screencolor">मनपसंद स्क्रीन रंग</string>
-  <string name="screencolor_save">सहेजें</string>
-  <string name="screencolor_cancel">रद्द करें</string>
   <string name="restore_preview">डिफ़ॉल्ट चित्र देखें</string>
   <string name="selectnewfile_menu">गैलरी से नया चित्र देखें</string>
   <string name="selectfile_menu">गैलरी से चित्र देखें</string>
@@ -515,9 +510,6 @@
   <string name="saturation_str">संतृप्ति: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">कोंट्रास्ट: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">तीव्रता: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">मानक</string>
-  <string name="screen_color_vivid">सस्पष्ट</string>
-  <string name="screen_color_custom">मनपसंद</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">दिन के समय और परिवेशी स्थितियों के अनुसार स्क्रीन को इष्टतमीकृत करें ताकि पठनीयता बढ़ें और आँखों पर कम दबाव पड़े</string>
   <string name="live_display_mode">डिस्प्ले मोड</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 3095962..759ffd0 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 stupnjeva</string>
   <string name="display_rotation_270_title">270 stupnjeva</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Boja zaslona</string>
-  <string name="screencolor_summary">Podešavanje nijansi zaslona, zasićenje, kontrasta ili intenziteta</string>
-  <string name="custom_screencolor">Prilagođena boja zaslona</string>
-  <string name="screencolor_save">Spremi</string>
-  <string name="screencolor_cancel">Odustani</string>
   <string name="restore_preview">Vidi zadanu sliku</string>
   <string name="selectnewfile_menu">Pogledaj novu sliku iz galerije</string>
   <string name="selectfile_menu">Prikaz slike iz galerije</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Zasićenost: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s </xliff:g></string>
   <string name="intensity_str">Intenzitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standardno</string>
-  <string name="screen_color_vivid">Živopisno</string>
-  <string name="screen_color_custom">Prilagođeno</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Prilagođuje zaslon prema vremenu dana i okolini za poboljšanje čitljivosti i smanjenje naprezanja očiju.</string>
   <string name="live_display_mode">Način prikaza</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index c329cc5..8fd4e5b 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -570,11 +570,6 @@
   <string name="display_rotation_180_title">180 fok</string>
   <string name="display_rotation_270_title">270 fok</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Képernyő színe</string>
-  <string name="screencolor_summary">Képernyő színárnyalat, színtelítettség, kontraszt, vagy intenzitás hangolása</string>
-  <string name="custom_screencolor">Egyéni képernyő színek</string>
-  <string name="screencolor_save">Mentés</string>
-  <string name="screencolor_cancel">Mégsem</string>
   <string name="restore_preview">Alapértelmezett kép megtekintése</string>
   <string name="selectnewfile_menu">Új kép megtekintése a galériából</string>
   <string name="selectfile_menu">Kép megtekintése a galériából</string>
@@ -583,9 +578,6 @@
   <string name="saturation_str">Telítettség: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontraszt: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenzitás: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Hagyományos</string>
-  <string name="screen_color_vivid">Élénk</string>
-  <string name="screen_color_custom">Egyéni</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizálja a képernyőt a napszaknak és a fényviszonyoknak megfelelően, javítva az olvashatóságot és csökkentve a szemek terhelését</string>
   <string name="live_display_mode">Képernyő mód</string>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index c4d4676..b6a48c7 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180 derajat</string>
   <string name="display_rotation_270_title">270 derajat</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Warna layar</string>
-  <string name="screencolor_summary">Menyetel warna layar, saturasi, kontras atau intensitas</string>
-  <string name="custom_screencolor">Warna layar khusus</string>
-  <string name="screencolor_save">Simpan</string>
-  <string name="screencolor_cancel">Batalkan</string>
   <string name="restore_preview">Lihat gambar semula</string>
   <string name="selectnewfile_menu">Lihat gambar baru dari Galeri</string>
   <string name="selectfile_menu">Lihat gambar dari Galeri</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">Saturasi: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontras: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitas: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standar</string>
-  <string name="screen_color_vivid">Jelas</string>
-  <string name="screen_color_custom">Khusus</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalkan layar berdasarkan waktu dan kondisi ruangan untuk meningkatkan keterbacaan dan mengurangi kelelahan mata</string>
   <string name="live_display_mode">Modus tampilan</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 6cd1e50..7657949 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 gradi</string>
   <string name="display_rotation_270_title">270 gradi</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Colore schermo</string>
-  <string name="screencolor_summary">Imposta tonalità, saturazione, contrasto o intensità dello schermo</string>
-  <string name="custom_screencolor">Colore schermo personalizzato</string>
-  <string name="screencolor_save">Salva</string>
-  <string name="screencolor_cancel">Annulla</string>
   <string name="restore_preview">Visualizza immagine predefinita</string>
   <string name="selectnewfile_menu">Visualizza nuova immagine dalla Galleria</string>
   <string name="selectfile_menu">Visualizza immagine dalla Galleria</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Saturazione: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrasto: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensità: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Vivido</string>
-  <string name="screen_color_custom">Personalizzato</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Ottimizza lo schermo in base all\'ora del giorno e alle condizioni ambientali per migliorare la leggibilità e ridurre l\'affaticamento degli occhi</string>
   <string name="live_display_mode">Modalità display</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index c3a3dd1..b6d3003 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -575,11 +575,6 @@
   <string name="display_rotation_180_title">180 מעלות</string>
   <string name="display_rotation_270_title">270 מעלות</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">צבע מסך</string>
-  <string name="screencolor_summary">שנה את הגדרות התצוגה: גוון, רוויה, ניגודיות או עוצמה</string>
-  <string name="custom_screencolor">צבע מסך מותאם אישית</string>
-  <string name="screencolor_save">שמור</string>
-  <string name="screencolor_cancel">בטל</string>
   <string name="restore_preview">צפה בתמונת ברירת מחדל</string>
   <string name="selectnewfile_menu">בחר תמונה חדשה מגלריה</string>
   <string name="selectfile_menu">בחר תמונה מגלריה</string>
@@ -588,9 +583,6 @@
   <string name="saturation_str">רוויה: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ניגודיות: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">עוצמה: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">רגיל</string>
-  <string name="screen_color_vivid">חי (Vivid)</string>
-  <string name="screen_color_custom">מותאם אישית</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">התאם את מסך מכשירך בהתאם לשעה ולתנאי הסביבה על מנת לשפר את נוחות הקריאה ולהפחית את עייפות העין</string>
   <string name="live_display_mode">מצב תצוגה</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index c94c5bd..5b3a9e9 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180度</string>
   <string name="display_rotation_270_title">270度</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">画面の色</string>
-  <string name="screencolor_summary">画面の色彩、彩度、コントラストまたは輝度を調整する</string>
-  <string name="custom_screencolor">カスタムの画面の色</string>
-  <string name="screencolor_save">保存</string>
-  <string name="screencolor_cancel">キャンセル</string>
   <string name="restore_preview">デフォルトの写真を表示</string>
   <string name="selectnewfile_menu">ギャラリーから新しい写真を表示</string>
   <string name="selectfile_menu">ギャラリーから写真を表示</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">彩度: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">コントラスト: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">強度: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">スタンダード</string>
-  <string name="screen_color_vivid">ビビッド</string>
-  <string name="screen_color_custom">カスタム</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">画面を見やすく、目の疲れを軽減するために、時間と周囲の環境に合わせて画面を最適化する</string>
   <string name="live_display_mode">ディスプレイのモード</string>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 6fa6c16..6079a57 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 ಡಿಗ್ರಿ</string>
   <string name="display_rotation_270_title">270 ಡಿಗ್ರಿ</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">ಪರದೆ ಬಣ್ಣ</string>
-  <string name="screencolor_summary">ಪರದೆ ವರ್ಣ, ಸ್ಯಾಚುರೇಶನ್, ಕಾಂಟ್ರಾಸ್ಟ್ ಅಥವ ತೀವ್ರತೆಯನ್ನು ಸರಿಹೊಂದಿಸಿ</string>
-  <string name="custom_screencolor">ಕಸ್ಟಮ್ ಪರದೆ ಬಣ್ಣ</string>
-  <string name="screencolor_save">ಉಳಿಸು</string>
-  <string name="screencolor_cancel">ರದ್ದು</string>
   <string name="restore_preview">ಡೀಫಾಲ್ಟ್ ಫೋಟೋ ವೀಕ್ಷಿಸಿ</string>
   <string name="selectnewfile_menu">ಹೊಸ ಫೋಟೋವನ್ನು ಗ್ಯಾಲರಿಯಿಂದ ವೀಕ್ಷಿಸಿ</string>
   <string name="selectfile_menu">ಫೋಟೋವನ್ನು ಗ್ಯಾಲರಿಯಿಂದ ವೀಕ್ಷಿಸಿ</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">ಸ್ಯಾಚುರೇಶನ್: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ಕಾಂಟ್ರಾಸ್ಟ್: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ತೀವ್ರತೆ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">ಸ್ಟಾಂಡರ್ಡ್</string>
-  <string name="screen_color_vivid">ಎದ್ದುಕಾಣುವ</string>
-  <string name="screen_color_custom">ಕಸ್ಟಮ್</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ದಿನದ ಸಮಯ ಮತ್ತು ಆಂಬಿಯೆಂಟ್ ಪರಿಸ್ಥಿತಿಯನ್ನು ಆಧಾರಿಸಿ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡುವುದರ ಮೂಲಕ ವಾಚನೀಯತೆಯನ್ನು ಉತ್ತಮಗೊಳಿಸುವುದರೊಂದಿಗೆ ಕಣ್ಣಿನ ಆಯಾಸವನ್ನು ಕಡಿಮೆ ಮಾಡಿ</string>
   <string name="live_display_mode">ಪ್ರದರ್ಶನ ಮೋಡ್</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index a996da0..92fe4ac 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180도</string>
   <string name="display_rotation_270_title">270도</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">화면 색상</string>
-  <string name="screencolor_summary">화면 색상, 채도, 명암비 또는 집적도를 조정</string>
-  <string name="custom_screencolor">사용자 정의 화면 색상</string>
-  <string name="screencolor_save">저장</string>
-  <string name="screencolor_cancel">취소</string>
   <string name="restore_preview">기본 사진 보기</string>
   <string name="selectnewfile_menu">갤러리에서 새 사진 보기</string>
   <string name="selectfile_menu">갤러리에서 사진 보기</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">채도: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">대비: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">강도: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">표준</string>
-  <string name="screen_color_vivid">생생하게</string>
-  <string name="screen_color_custom">사용자 지정</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">가독성을 향상시키고 눈의 피로를 줄이기 위해 주변 환경과 시간에 따라 화면을 최적화</string>
   <string name="live_display_mode">디스플레이 모드</string>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 34fca70..6a29850 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -471,10 +471,6 @@
   <string name="display_rotation_180_title">180 پلە</string>
   <string name="display_rotation_270_title">270 پلە</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">ڕەنگی ڕوونما</string>
-  <string name="custom_screencolor">ڕێکخستنی ڕەنگی ڕوونما</string>
-  <string name="screencolor_save">پاشەکەوتکردن</string>
-  <string name="screencolor_cancel">پاشگەزبوونەوە</string>
   <string name="restore_preview">بینینی وێنەی بنەڕەتی</string>
   <string name="selectnewfile_menu">بینینی وێنەی نوێ لە پێشانگەوە</string>
   <string name="selectfile_menu">بینینی وێنە لە پێشانگەوە</string>
@@ -483,9 +479,6 @@
   <string name="saturation_str">تێریی ڕەنگ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">کۆنتراست: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">توندێتیی ڕەنگ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">پێوانەی</string>
-  <string name="screen_color_vivid">زیرەکی</string>
-  <string name="screen_color_custom">درووستکراو</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">پاشینەسازی لەسەر شاشەکەت  بەندە بە کاتی ڕۆژ وە مەرجی چاکسازی بۆ خوێندنەوەی و کەمکردنەوەی چاوسوین</string>
   <string name="live_display_mode">پیشاندانی بار</string>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 2182d75..862b713 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -549,11 +549,6 @@
   <string name="display_rotation_180_title">180 Grad</string>
   <string name="display_rotation_270_title">270 Grad</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Schiermfaarf</string>
-  <string name="screencolor_summary">Faarftoun, Faarfsättegung, Kontrast an Intensitéit vum Schierm veränneren</string>
-  <string name="custom_screencolor">Benotzerdefinéiert Schiermfaarf</string>
-  <string name="screencolor_save">Späicheren</string>
-  <string name="screencolor_cancel">Ofbriechen</string>
   <string name="restore_preview">Standard-Bild uweisen</string>
   <string name="selectnewfile_menu">Neit Bild aus der Galerie uweisen</string>
   <string name="selectfile_menu">Bild aus der Galerie uweisen</string>
@@ -562,9 +557,6 @@
   <string name="saturation_str">Sättegung: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitéit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Lieweg</string>
-  <string name="screen_color_custom">Ugepasst</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optiméiert däi Schierm andeem s e sech op der Dageszäit an den Ëmgéigendskonditioune baséiert, fir d\'Liesbarkeet ze verbesseren an d\'Ermiddung vun den Aen ze reduzéieren</string>
   <string name="live_display_mode">Schiermmodus</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 967f04a..dfafc8b 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -507,11 +507,6 @@
   <string name="display_rotation_180_title">180 laipsnių</string>
   <string name="display_rotation_270_title">270 laipsnių</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekrano spalva</string>
-  <string name="screencolor_summary">Nustatyti ekrano atspalvį, saturaciją, kontrastą arba intensyvumą</string>
-  <string name="custom_screencolor">Tinkinta ekrano spalva</string>
-  <string name="screencolor_save">Išsaugoti</string>
-  <string name="screencolor_cancel">Atšaukti</string>
   <string name="restore_preview">Žiūrėti numatytąjį vaizdą</string>
   <string name="selectnewfile_menu">Žiūrėti naują vaizdą iš galerijos</string>
   <string name="selectfile_menu">Žiūrėti vaizdą iš galerijos</string>
@@ -520,9 +515,6 @@
   <string name="saturation_str">Saturacija: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrastas: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensyvumas: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standartinis</string>
-  <string name="screen_color_vivid">Ryškus</string>
-  <string name="screen_color_custom">Priskirtas</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizuoti ekraną remiantis paros metu ir aplinkos sąlygomis, siekiant pagerinti įskaitomumą ir sumažinti akių įtampą</string>
   <string name="live_display_mode">Rodymo režimas</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 96523cc..10b71f3 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -370,10 +370,6 @@
   <string name="display_rotation_180_title">180 grādi</string>
   <string name="display_rotation_270_title">270 grādi</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekrāna krāsa</string>
-  <string name="custom_screencolor">Pielāgota ekrāna krāsa</string>
-  <string name="screencolor_save">Saglabāt</string>
-  <string name="screencolor_cancel">Atcelt</string>
   <string name="restore_preview">Skatīt noklusēto attēlu</string>
   <string name="selectnewfile_menu">Skatīt jaunu attēlu no galerijas</string>
   <string name="selectfile_menu">Skatīt attēlu no galerijas</string>
@@ -382,7 +378,6 @@
   <string name="saturation_str">Piesātinājums: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrasts: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Spilgtums: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_custom">Pielāgots</string>
   <!-- LiveDisplay -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index dc849aa..c3cfce2 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 ഡിഗ്രി</string>
   <string name="display_rotation_270_title">270 ഡിഗ്രി</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">സ്ക്രീൻ നിറം</string>
-  <string name="screencolor_summary">സ്ക്രീൻ ഹ്യൂ, സാച്ചുറേഷൻ, ദൃശ്യതീവ്രത അല്ലെങ്കിൽ തീവ്രത ട്യൂണ്‍ ചെയ്യുക</string>
-  <string name="custom_screencolor">ഇഷ്ടാനുസൃത സ്ക്രീൻ നിറം</string>
-  <string name="screencolor_save">സംരക്ഷിക്കുക</string>
-  <string name="screencolor_cancel">റദ്ദാക്കുക</string>
   <string name="restore_preview">ഡിഫോള്‍ട്ട് ചിത്രം കാണുക</string>
   <string name="selectnewfile_menu">ഗാലറിയിൽ നിന്നും പുതിയ ചിത്രം കാണുക</string>
   <string name="selectfile_menu">ഗാലറിയിൽ നിന്നും ചിത്രം കാണുക</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">സാച്ചുറേഷൻ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ദൃശ്യതീവ്രത: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">തീവ്രത: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">അടിസ്ഥാനം</string>
-  <string name="screen_color_vivid">ഉജ്ജ്വലം</string>
-  <string name="screen_color_custom">ഇഷ്‌ടാനുസൃതം</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">വായനാക്ഷമത മെച്ചപ്പെടുത്തുന്നതിനും കണ്ണുകളുടെ സമ്മര്‍ദ്ദം കുറയ്ക്കാനും സമയത്തിന്‍റെയും ചുറ്റുപാടിന്റെ സാഹചര്യത്തിന്റെയും അടിസ്ഥാനത്തില്‍ നിങ്ങളുടെ സ്ക്രീന്‍ ഒപ്റ്റിമൈസ് ചെയ്യുക.</string>
   <string name="live_display_mode">ഡിസ്പ്ലേ മോഡ്</string>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 795f0fa..110df02 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 अंश</string>
   <string name="display_rotation_270_title">270 अंश</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">स्क्रीन रंग</string>
-  <string name="screencolor_summary">स्क्रीन रंगछटा, संपृक्तता, वैधर्म्य किंवा तीव्रता</string>
-  <string name="custom_screencolor">स्क्रीन रंग सानुकूल करा</string>
-  <string name="screencolor_save">जतन करा</string>
-  <string name="screencolor_cancel">रद्द करा</string>
   <string name="restore_preview">डिफॉल्ट चित्र पाहा</string>
   <string name="selectnewfile_menu">गॅलरीतून नवीन चित्र पाहा</string>
   <string name="selectfile_menu">गॅलरीतून चित्र पाहा</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">संपृक्तता: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">वैधर्म्य: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">तीव्रता: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">मानक</string>
-  <string name="screen_color_vivid">स्पष्ट</string>
-  <string name="screen_color_custom">सानुकूल</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">वाचनीयता सुधारण्यासाठी आणि डोळ्यांवरील ताण कमी करण्यासाठी दिवसाची वेळ आणि आसपासची स्थिती यानुसार तुमचा स्क्रीन अनुकूल करा</string>
   <string name="live_display_mode">प्रदर्शन मोड</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 2a00f78..cd404e8 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 grader</string>
   <string name="display_rotation_270_title">270 grader</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Skjermfarge</string>
-  <string name="screencolor_summary">Justere skjermens sorttype, metning, kontrast eller intensitet</string>
-  <string name="custom_screencolor">Tilpasset skjermfarge</string>
-  <string name="screencolor_save">Lagre</string>
-  <string name="screencolor_cancel">Avbryt</string>
   <string name="restore_preview">Vis standardbilde</string>
   <string name="selectnewfile_menu">Vis nytt bilde fra galleriet</string>
   <string name="selectfile_menu">Vis bilde fra galleriet</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Metning: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Levende</string>
-  <string name="screen_color_custom">Egendefinert</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalisere skjermen basert på tidspunkt på dagen og omgivelsesforhold å forbedre lesbarhet og redusere belastningen på øynene</string>
   <string name="live_display_mode">Visningsmodus</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 611c8c8..cf14d07 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180 graden</string>
   <string name="display_rotation_270_title">270 graden</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Schermkleur</string>
-  <string name="screencolor_summary">Tint, verzadiging, contrast en intensiteit van het scherm aanpassen</string>
-  <string name="custom_screencolor">Aangepaste schermkleur</string>
-  <string name="screencolor_save">Opslaan</string>
-  <string name="screencolor_cancel">Annuleren</string>
   <string name="restore_preview">Standaardfoto bekijken</string>
   <string name="selectnewfile_menu">Nieuwe foto uit Galerij bekijken</string>
   <string name="selectfile_menu">Foto uit Galerij bekijken</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">Verzadiging: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiteit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standaard</string>
-  <string name="screen_color_vivid">Levendig</string>
-  <string name="screen_color_custom">Aangepast</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Uw scherm optimaliseren aan de hand van tijdstip op de dag en lichtomstandigheden om de leesbaarheid te verbeteren en oogvermoeidheid te verminderen</string>
   <string name="live_display_mode">Weergavemodus</string>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index afcbc36..a135040 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 ଡିଗ୍ରୀ</string>
   <string name="display_rotation_270_title">270 ଡିଗ୍ରୀ</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">ସ୍କ୍ରିନ୍‍ ରଙ୍ଗ</string>
-  <string name="screencolor_summary">ଘ୍ୟୁ, ସାଚୁରେସନ୍‍, କଂଟ୍ରାଷ୍ଟ ବା ତୀବ୍ରତା ଟ୍ଯୁନ୍‍ କରନ୍ତୁ</string>
-  <string name="custom_screencolor">ସ୍କ୍ରିନ୍‍ ରଙ୍ଗ କଷ୍ଟମ୍‍ କରନ୍ତୁ</string>
-  <string name="screencolor_save">ସଞ୍ଚୟ</string>
-  <string name="screencolor_cancel">ବାତିଲ</string>
   <string name="restore_preview">ଡିଫଲ୍ଟ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
   <string name="selectnewfile_menu">ଗ୍ୟାଲେରୀରୁ ନୂଆ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
   <string name="selectfile_menu">ଗ୍ୟାଲେରୀରୁ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">ସାଚୁରେସନ୍‍: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">କଣ୍ଟ୍ରାଷ୍ଟ: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ତୀବ୍ରତା: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">ମାନାଙ୍କ</string>
-  <string name="screen_color_vivid">ଭିଭିଦ</string>
-  <string name="screen_color_custom">କଷ୍ଟମ୍</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ରିଡେବିଲିଟି ବୃଦ୍ଧି କରିବା ପାଇଁ ଓ ୱ୍ୱିଷ୍ଟ୍ରେନ୍‍ ହ୍ରାସ କରିବା ପାଇଁ ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଦିନର ସମୟ ଓ ଆମ୍ବିଏଣ୍ଟ ସର୍ତ୍ତାବଳି ଉପରେ ନିଭର କରି ଅପ୍ଟିମାଇଜ୍‍ କରନ୍ତୁ</string>
   <string name="live_display_mode">ଡିସ୍‍ପ୍ଲେ ମୋଡ୍‍</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 5ee3eff..fbd8f65 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -567,11 +567,6 @@
   <string name="display_rotation_180_title">180 stopni</string>
   <string name="display_rotation_270_title">270 stopni</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Kolor ekranu</string>
-  <string name="screencolor_summary">Dostosuj odcień, nasycenie, kontrast lub intensywność ekranu</string>
-  <string name="custom_screencolor">Własny kolor ekranu</string>
-  <string name="screencolor_save">Zapisz</string>
-  <string name="screencolor_cancel">Anuluj</string>
   <string name="restore_preview">Pokaż domyślny obraz</string>
   <string name="selectnewfile_menu">Zobacz nowy obraz w Galerii</string>
   <string name="selectfile_menu">Zobacz zdjęcie z Galerii</string>
@@ -580,9 +575,6 @@
   <string name="saturation_str">Nasycenie: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensywność: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standardowo</string>
-  <string name="screen_color_vivid">Żywy</string>
-  <string name="screen_color_custom">Własna</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optymalizuj swój ekran bazując na porze dnia i warunkach panujących w otoczeniu, aby zwiększyć czytelność i zmniejszyć uczucie zmęczenia oczu</string>
   <string name="live_display_mode">Tryb wyświetlania</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index b60702a..c5e0b52 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 graus</string>
   <string name="display_rotation_270_title">270 graus</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Cor da tela</string>
-  <string name="screencolor_summary">Ajustar tom, saturação, contraste ou intensidade da tela</string>
-  <string name="custom_screencolor">Cor personalizada da tela</string>
-  <string name="screencolor_save">Salvar</string>
-  <string name="screencolor_cancel">Cancelar</string>
   <string name="restore_preview">Visualizar imagem padrão</string>
   <string name="selectnewfile_menu">Visualizar nova imagem da Galeria</string>
   <string name="selectfile_menu">Visualizar imagem da Galeria</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Saturação: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidade: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Padrão</string>
-  <string name="screen_color_vivid">Vívido</string>
-  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Otimiza sua tela com base na hora do dia e condições do ambiente para melhorar a legibilidade e reduzir o cansaço visual</string>
   <string name="live_display_mode">Modo da tela</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index dfceabf..ef12bdb 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 graus</string>
   <string name="display_rotation_270_title">270 graus</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Cor do ecrã</string>
-  <string name="screencolor_summary">Ajustar o tom, saturação, contraste ou intensidade do ecrã</string>
-  <string name="custom_screencolor">Cor personalizada do ecrã</string>
-  <string name="screencolor_save">Gravar</string>
-  <string name="screencolor_cancel">Cancelar</string>
   <string name="restore_preview">Visualizar imagem predefinida</string>
   <string name="selectnewfile_menu">Visualizar nova imagem da Galeria</string>
   <string name="selectfile_menu">Visualizar imagem da Galeria</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Saturação: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidade: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Padrão</string>
-  <string name="screen_color_vivid">Brilhante</string>
-  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Otimiza o ecrã com base na hora do dia e condições do ambiente para melhorar a legibilidade e reduzir a fadiga ocular</string>
   <string name="live_display_mode">Modo de exibição</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 2dec126..1f0e8c7 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -541,11 +541,6 @@
   <string name="display_rotation_180_title">180 de grade</string>
   <string name="display_rotation_270_title">270 de grade</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Culoare ecran</string>
-  <string name="screencolor_summary">Reglează nuanța, saturația, contrastul sau intensitatea ecranului</string>
-  <string name="custom_screencolor">Culoare ecran personalizată</string>
-  <string name="screencolor_save">Salvaţi</string>
-  <string name="screencolor_cancel">Revocaţi</string>
   <string name="restore_preview">Vezi imaginea implicită</string>
   <string name="selectnewfile_menu">Vezi noua imagine din Galerie</string>
   <string name="selectfile_menu">Vezi imaginea din Galerie</string>
@@ -554,9 +549,6 @@
   <string name="saturation_str">Saturația: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrastul: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitatea: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Viu</string>
-  <string name="screen_color_custom">Particularizat</string>
   <!-- LiveDisplay -->
   <string name="live_display_mode">Mod de afișare</string>
   <string name="live_display_color_temperature_title">Temperatura culorii</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 427b443..6e5b38c 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 градусов</string>
   <string name="display_rotation_270_title">270 градусов</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Цветопередача экрана</string>
-  <string name="screencolor_summary">Настройка оттенка, уровней насыщенности и контрастности экрана</string>
-  <string name="custom_screencolor">Пользовательская цветопередача</string>
-  <string name="screencolor_save">Сохранить</string>
-  <string name="screencolor_cancel">Отмена</string>
   <string name="restore_preview">Стандартный значок</string>
   <string name="selectnewfile_menu">Выбрать новое изображение из «Галереи»</string>
   <string name="selectfile_menu">Выбрать из «Галереи»</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Насыщенность: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Контрастность: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Интенсивность: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Стандартный</string>
-  <string name="screen_color_vivid">Яркий</string>
-  <string name="screen_color_custom">Не задано</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Подстраивать экран на основе времени суток и освещения, чтобы повысить удобочитаемость и снизить нагрузку на глаза</string>
   <string name="live_display_mode">Режим экрана</string>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 29408c1..beb668e 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -378,10 +378,6 @@
   <string name="display_rotation_180_title">අංශක 180</string>
   <string name="display_rotation_270_title">අංශක 270</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">තිරයේ පැහැය</string>
-  <string name="custom_screencolor">රිසිවූ තිර පැහැය</string>
-  <string name="screencolor_save">සුරකින්න</string>
-  <string name="screencolor_cancel">එපා</string>
   <string name="restore_preview">පෙරනිමි පින්තූරය බලන්න</string>
   <string name="selectnewfile_menu">ගැලරියෙන් නව පින්තූරයක් බලන්න</string>
   <string name="selectfile_menu">ගැලරියෙන් පින්තූරය බලන්න</string>
@@ -390,7 +386,6 @@
   <string name="saturation_str">සන්තෘප්තිය: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ප්‍රභේදනය: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">තීව්‍රතාව: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_custom">රිසිවූ</string>
   <!-- LiveDisplay -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 8744330..1424557 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -507,11 +507,6 @@
   <string name="display_rotation_180_title">180 stupňov</string>
   <string name="display_rotation_270_title">270 stupňov</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Farba obrazovky</string>
-  <string name="screencolor_summary">Upraviť tón, sýtosť, kontrast alebo intenzitu displeja</string>
-  <string name="custom_screencolor">Vlastná farba obrazovky</string>
-  <string name="screencolor_save">Uložiť</string>
-  <string name="screencolor_cancel">Zrušiť</string>
   <string name="restore_preview">Zobraziť predvolený obrázok</string>
   <string name="selectnewfile_menu">Zobraziť nový obrázok z Galérie</string>
   <string name="selectfile_menu">Zobraziť obrázok z Galérie</string>
@@ -520,9 +515,6 @@
   <string name="saturation_str">Sýtosť: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenzita: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Štandardná</string>
-  <string name="screen_color_vivid">Sýta</string>
-  <string name="screen_color_custom">Vlastná</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizovať vašu obrazovku na základe dennej doby a podmienok okolia na zlepšenie čitateľnosti a zníženie únavy očí</string>
   <string name="live_display_mode">Režim zobrazenia</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 585ffdd..fce24c2 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -575,11 +575,6 @@
   <string name="display_rotation_180_title">180 stopinj</string>
   <string name="display_rotation_270_title">270 stopinj</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Barva zaslona</string>
-  <string name="screencolor_summary">Naravnajte odtenek, nasičenost, kontrast in jakost zaslona</string>
-  <string name="custom_screencolor">Barva zaslona po meri</string>
-  <string name="screencolor_save">Shrani</string>
-  <string name="screencolor_cancel">Prekliči</string>
   <string name="restore_preview">Pokaži privzeto sliko</string>
   <string name="selectnewfile_menu">Pokaži novo sliko iz galerije</string>
   <string name="selectfile_menu">Pokaži sliko iz galerije</string>
@@ -588,9 +583,6 @@
   <string name="saturation_str">Nasičenost: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Jakost: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Običajno</string>
-  <string name="screen_color_vivid">Živahno</string>
-  <string name="screen_color_custom">Po meri</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiziraj zaslon glede na čas dneva in pogoje okolice, da se izboljša berljivost in zmanjša obremenitev oči</string>
   <string name="live_display_mode">Način prikaza</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index bc90179..b87d888 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 степени</string>
   <string name="display_rotation_270_title">270 степени</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Боја екрана</string>
-  <string name="screencolor_summary">Подеси нијансу, засићење, контраст и интензитет</string>
-  <string name="custom_screencolor">Прилагођена боја екрана</string>
-  <string name="screencolor_save">Сачувај</string>
-  <string name="screencolor_cancel">Откажи</string>
   <string name="restore_preview">Погледај подразумевану слику</string>
   <string name="selectnewfile_menu">Погледај нову слику из Галерије</string>
   <string name="selectfile_menu">Погледај слику из Галерије</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Засићење: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Интензитет: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Стандардно</string>
-  <string name="screen_color_vivid">Живописно</string>
-  <string name="screen_color_custom">Прилагођено</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Оптимизуј екран у складу са дневним и просторним приликама да побољшаш читљивост и умањиш замарање очију</string>
   <string name="live_display_mode">Режим екрана</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 5d908d2..cdd510d 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -570,11 +570,6 @@
   <string name="display_rotation_180_title">180 grader</string>
   <string name="display_rotation_270_title">270 grader</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Skärmfärg</string>
-  <string name="screencolor_summary">Ställ in skärmnyans, mättnad, kontrast eller intensitet</string>
-  <string name="custom_screencolor">Anpassad skärmfärg</string>
-  <string name="screencolor_save">Spara</string>
-  <string name="screencolor_cancel">Avbryt</string>
   <string name="restore_preview">Visa standardbild</string>
   <string name="selectnewfile_menu">Visa ny bild från galleriet</string>
   <string name="selectfile_menu">Visa bild från galleriet</string>
@@ -583,9 +578,6 @@
   <string name="saturation_str">Mättnad: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Levande</string>
-  <string name="screen_color_custom">Anpassad</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimera din skärm baserad på dygnets tidpunkt och omgivande förhållanden för att förbättra läsbarhet och minska belastningen på ögonen</string>
   <string name="live_display_mode">Visningsläge</string>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index ec4e4f3..531b9ca 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 டிகிரீ</string>
   <string name="display_rotation_270_title">270 டிகிரீ</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">திரை நிறம்</string>
-  <string name="screencolor_summary">திரை வண்ணக்கூறு, கான்டிராஸ்ட் அல்லது தீவிரத்தை டியூன் செய்</string>
-  <string name="custom_screencolor">தனிப்பயனாக்கப்பட்ட திரை நிறம்</string>
-  <string name="screencolor_save">சேமி</string>
-  <string name="screencolor_cancel">ரத்துசெய்</string>
   <string name="restore_preview">இயல்நிலை படத்தை காண்</string>
   <string name="selectnewfile_menu">கேலரியில் இருந்து புது படத்தைக் காண்</string>
   <string name="selectfile_menu">கேலரியில் இருநந்து படத்தைக் காண்</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">சாச்சுரேசன்: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">கான்டிராஸ்ட்: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">இன்டென்சிட்டி: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">நிலையான</string>
-  <string name="screen_color_vivid">தெளிவு</string>
-  <string name="screen_color_custom">தனிப்பயன்</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">வாசிக்கும்தன்மையை மேம்படுத்தவும் கண்ணுக்கு சிரமத்தை குறைக்கவும் நாளின் நேரத்தையும் சுற்றுச்சூழல் நிலைமைகளையும் பொருத்து உங்கள் திரையை உகந்ததாக்குங்கள்</string>
   <string name="live_display_mode">காட்சி முறை</string>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 3415593..24db942 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 డిగ్రీలు</string>
   <string name="display_rotation_270_title">270 డిగ్రీలు</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">స్క్రీన్ రంగు</string>
-  <string name="screencolor_summary">స్క్రీన్ వర్ణం, సంతృప్తత, వర్ణ వ్యత్యాసం లేదా తీవ్రతలను ట్యూన్ చేయుము</string>
-  <string name="custom_screencolor">స్క్రీన్ రంగును అనుకూలితం చేయుము</string>
-  <string name="screencolor_save">సేవ్ చేయి</string>
-  <string name="screencolor_cancel">రద్దు చేయి</string>
   <string name="restore_preview">స్వయంసిద్ధ చిత్రాన్ని వీక్షించుము</string>
   <string name="selectnewfile_menu">గ్యాలరీ నుండి క్రొత్త చిత్రాన్ని వీక్షించుము</string>
   <string name="selectfile_menu">గ్యాలరీ నుండి చిత్రాన్ని వీక్షించుము</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">సంతృప్తత: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">వర్ణ వ్యత్యాసం: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">తీవ్రత: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">ప్రామాణిక</string>
-  <string name="screen_color_vivid">ప్రకాశవంతమైన</string>
-  <string name="screen_color_custom">అనుకూలం</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">చదవడానికి అనుకూలంగా ఉండే విధంగా మరియు కళ్ళ పైన ఒత్తిడిని తగ్గించేందుకు రోజు యొక్క సమయం మరియు పరిసర పరిస్థితులను బట్టి సమయాన్ని సెట్ చేయండి</string>
   <string name="live_display_mode">ప్రదర్శిత మోడ్</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index a496f86..40cd242 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180 องศา</string>
   <string name="display_rotation_270_title">270 องศา</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">สีหน้าจอ</string>
-  <string name="screencolor_summary">ปรับแต่งสี ความอิ่มต้ว ความคมชัด หรือความเข้มของหน้าจอ</string>
-  <string name="custom_screencolor">สีหน้าจอกำหนดเอง</string>
-  <string name="screencolor_save">บันทึก</string>
-  <string name="screencolor_cancel">ยกเลิก</string>
   <string name="restore_preview">ดูรูปภาพเริ่มต้น</string>
   <string name="selectnewfile_menu">ดูรูปภาพใหม่จากแกลเลอรี</string>
   <string name="selectfile_menu">ดูรูปภาพจากแกลลอรี</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">ความอิ่มตัว: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ความเข้มจาง: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ความเข้มข้น: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">มาตราฐาน</string>
-  <string name="screen_color_vivid">สดใส</string>
-  <string name="screen_color_custom">กำหนดเอง</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ปรับหน้าความสว่างหน้าจอตามเวลาและแสงโดยรอบเพื่อทำให้อ่านได้ง่ายขึ้นและลดอาการปวดตา</string>
   <string name="live_display_mode">รูปแบบการแสดงผล</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 1c38ad9..d16e190 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 derece</string>
   <string name="display_rotation_270_title">270 derece</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekran rengi</string>
-  <string name="screencolor_summary">Ekran renk tonunu, doygunluğunu, karşıtlığını veya yoğunluğunu ayarla</string>
-  <string name="custom_screencolor">Özel ekran rengi</string>
-  <string name="screencolor_save">Kaydet</string>
-  <string name="screencolor_cancel">İptal</string>
   <string name="restore_preview">Varsayılan resmi görüntüle</string>
   <string name="selectnewfile_menu">Galeriden yeni resmi görüntüle</string>
   <string name="selectfile_menu">Galeriden resmi görüntüle</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Doygunluk: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Zıtlık: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Yoğunluk: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standart</string>
-  <string name="screen_color_vivid">Canlı</string>
-  <string name="screen_color_custom">Özel</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Okunabilirliği artırmak ve göz yorgunluğu azaltmak için gün ve ortam koşulları zamanına bağlı olarak ekranı iyileştirir</string>
   <string name="live_display_mode">Görüntü modu</string>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index 029ffc0..fe73c1d 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 گرادۇس</string>
   <string name="display_rotation_270_title">270 گرادۇس</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">ئېكران رەڭگى</string>
-  <string name="screencolor_summary">رەڭ تۈسى، تويۇنۇشچانلىقى، ئاق-قارىلىقى ياكى يورۇقلۇقىنى تەڭشەيدۇ</string>
-  <string name="custom_screencolor">ئىختىيارىي ئېكران رەڭگى</string>
-  <string name="screencolor_save">ساقلا</string>
-  <string name="screencolor_cancel">ۋاز كەچ</string>
   <string name="restore_preview">كۆڭۈلدىكى رەسىمنى كۆرسىتىدۇ</string>
   <string name="selectnewfile_menu">رەسىم توپلىمىدىن يېڭى رەسىمنى كۆرسىتىدۇ</string>
   <string name="selectfile_menu">رەسىم توپلىمىدىن رەسىمنى كۆرسىتىدۇ</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">تويۇنۇشچانلىقى: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ئاق-قارىلىقى: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">يورۇقلۇقى: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">ئۆلچەملىك</string>
-  <string name="screen_color_vivid">جانلىق</string>
-  <string name="screen_color_custom">ئىختىيارىي</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ۋاقىت ۋە مۇھىت شەرتى ئاساسىدا ئېكرانىڭىزنى ئەلالاشتۇرۇپ ئوقۇشچانلىقنى ياخشىلاپ كۆز چارچاشنى تۆۋەنلىتىدۇ</string>
   <string name="live_display_mode">كۆرسىتىش ھالىتى</string>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 9d06bff..4ed8089 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -555,11 +555,6 @@
   <string name="display_rotation_180_title">180 градусів</string>
   <string name="display_rotation_270_title">270 градусів</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Колір екрану</string>
-  <string name="screencolor_summary">Налаштування відтінку екрану, насиченості, контрасту або інтенсивності</string>
-  <string name="custom_screencolor">Налаштування кольору екрану</string>
-  <string name="screencolor_save">Зберегти</string>
-  <string name="screencolor_cancel">Скасувати</string>
   <string name="restore_preview">Стандартний значок</string>
   <string name="selectnewfile_menu">Вибрати нове зображення з «Галереї»</string>
   <string name="selectfile_menu">Вибрати зображення з «Галереї»</string>
@@ -568,9 +563,6 @@
   <string name="saturation_str">Насиченість: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Інтенсивність: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Стандартний</string>
-  <string name="screen_color_vivid">Яскравий</string>
-  <string name="screen_color_custom">Не заданий</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Налаштовувати екран залежно від часу доби і умов освітлення для підвищення зручності читання і зменшення втоми очей</string>
   <string name="live_display_mode">Режим екрану</string>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 60e2959..4b24827 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180 độ</string>
   <string name="display_rotation_270_title">270 độ</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Màu sắc màn hình</string>
-  <string name="screencolor_summary">Điều chỉnh tông màu, độ bão hòa, độ tương phản hoặc cường độ màn hình</string>
-  <string name="custom_screencolor">Tùy chỉnh màu sắc màn hình</string>
-  <string name="screencolor_save">Lưu</string>
-  <string name="screencolor_cancel">Huỷ</string>
   <string name="restore_preview">Xem ảnh mặc định</string>
   <string name="selectnewfile_menu">Xem ảnh mới từ Thư viện</string>
   <string name="selectfile_menu">Xem hình ảnh từ Thư viện</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">Độ bão hòa: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">Độ tương phản: <xliff:g id="contrast_value">%1$s </xliff:g></string>
   <string name="intensity_str">Cường độ: <xliff:g id="intensity_str_value">%1$s </xliff:g></string>
-  <string name="screen_color_standard">Chuẩn</string>
-  <string name="screen_color_vivid">Sống động</string>
-  <string name="screen_color_custom">Tùy chỉnh</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Tối ưu hóa màn hình dựa trên điều kiện môi trường và thời gian trong ngày để cải thiện khả năng đọc và giảm mỏi mắt</string>
   <string name="live_display_mode">Chế độ hiển thị</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index f0fec8b..62eb4a3 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 度</string>
   <string name="display_rotation_270_title">270 度</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">屏幕颜色</string>
-  <string name="screencolor_summary">调整屏幕色调、饱和度、对比度或亮度</string>
-  <string name="custom_screencolor">自定义屏幕颜色</string>
-  <string name="screencolor_save">保存</string>
-  <string name="screencolor_cancel">取消</string>
   <string name="restore_preview">查看默认图片</string>
   <string name="selectnewfile_menu">从图库查看新图片</string>
   <string name="selectfile_menu">从图库查看图片</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">饱和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">对比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">强度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">标准</string>
-  <string name="screen_color_vivid">鲜艳</string>
-  <string name="screen_color_custom">自定义</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">基于时间和环境条件来优化您的屏幕以改善可读性和减少眼睛疲劳</string>
   <string name="live_display_mode">显示模式</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 05aafab..f191cdf 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -474,11 +474,6 @@
   <string name="display_rotation_180_title">180 度</string>
   <string name="display_rotation_270_title">270 度</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">螢幕顏色</string>
-  <string name="screencolor_summary">調整螢幕色調、 飽和度、 對比度或強度</string>
-  <string name="custom_screencolor">自訂螢幕顏色</string>
-  <string name="screencolor_save">儲存</string>
-  <string name="screencolor_cancel">取消</string>
   <string name="restore_preview">檢視預設圖片</string>
   <string name="selectnewfile_menu">從圖片庫查看新圖片</string>
   <string name="selectfile_menu">從圖片庫查看圖片</string>
@@ -487,9 +482,6 @@
   <string name="saturation_str">飽和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">對比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">強度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">標準</string>
-  <string name="screen_color_vivid">鮮明</string>
-  <string name="screen_color_custom">自訂</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">您可根據每日時間和環境條件來優化螢幕顯示，以提升可讀性和減少眼睛疲勞</string>
   <string name="live_display_mode">顯示模式</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 80b5fe9..33e61bb 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -553,11 +553,6 @@
   <string name="display_rotation_180_title">180 度</string>
   <string name="display_rotation_270_title">270 度</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">螢幕顏色</string>
-  <string name="screencolor_summary">調整螢幕色調、 飽和度、 對比度或強度</string>
-  <string name="custom_screencolor">自訂螢幕顏色</string>
-  <string name="screencolor_save">儲存</string>
-  <string name="screencolor_cancel">取消</string>
   <string name="restore_preview">檢視預設相片</string>
   <string name="selectnewfile_menu">從圖片庫查看新圖片</string>
   <string name="selectfile_menu">從圖片庫查看圖片</string>
@@ -566,9 +561,6 @@
   <string name="saturation_str">飽和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">對比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">亮度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">標準</string>
-  <string name="screen_color_vivid">鮮豔</string>
-  <string name="screen_color_custom">自訂</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">基於日夜和環境條件調整您的螢幕色溫，以改善可讀性和減少眼睛疲勞</string>
   <string name="live_display_mode">顯示模式</string>
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 6901fae..35b2bf7 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -360,13 +360,6 @@
         <item>silent</item>
     </string-array>
 
-    <!-- Values for screen color  -->
-    <string-array name="screen_color_setting" translatable="false">
-        <item>@string/screen_color_standard</item>
-        <item>@string/screen_color_vivid</item>
-        <item>@string/screen_color_custom</item>
-    </string-array>
-
     <!-- Stylus Gestures -->
     <string-array name="gestures_entries" translatable="false">
         <item>@string/gestures_action_empty</item>
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 8e0a0f1..3492078 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -18,7 +18,6 @@ limitations under the License.
     <color name="floating_action_button_touch_tint">#80ffffff</color>
     <color name="theme_accent">#ff009688</color>
 
-    <color name="screencolor_background">#50000000</color>
     <drawable name="transparent_background">#00000000</drawable>
 
     <drawable name="expanded_item_bg_activated">#ffEEEEEE</drawable>
@@ -63,7 +62,6 @@ limitations under the License.
 
     <!-- Personal Dictionary Add Icon -->
     <drawable name="ic_menu_add_word">@drawable/ic_menu_add_dark</drawable>
-    <color name="screencolor_background">#50000000</color>
     <drawable name="transparent_background">#00000000</drawable>
     <!-- NFC hard colors -->
     <color name="nfc_how_it_works_main_background">#FF80CBC4</color>
@@ -120,12 +118,10 @@ limitations under the License.
 
     <color name="storage_wizard_button_text_color">@color/text_color_white</color>
     <color name="storage_wizard_red_button_text_color">@color/text_color_white</color>
-    <color name="screen_color_button_text_color">@color/text_color_white</color>
     <color name="privacy_guard_error_text_color">@color/text_color_white</color>
     <color name="crypt_keeper_status_text_color">@color/text_color_white</color>
     <color name="crypt_keeper_lock_pattern_text_color">@color/text_color_white</color>
     <color name="crypt_keeper_emergency_button_text_color">@color/text_color_white</color>
-    <color name="custom_screencolor_buttons_text_color">@color/text_color_white</color>
 
     <color name="weather_settings_icon_tint">#B4B9BA</color>
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 3e8c02a..d05ce40 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -656,25 +656,6 @@
     <string name="display_rotation_180_title">180 degrees</string>
     <string name="display_rotation_270_title">270 degrees</string>
 
-    <!-- Display settings.  Screen color. -->
-    <string name="screencolor">Screen color</string>
-    <string name="screencolor_summary">Tune screen hue, saturation, contrast or intensity</string>
-    <string name="custom_screencolor">Custom screen color</string>
-    <string name="screencolor_save">Save</string>
-    <string name="screencolor_cancel">Cancel</string>
-    <string name="restore_preview">View default picture</string>
-    <string name="selectnewfile_menu">View new picture from Gallery</string>
-    <string name="selectfile_menu">View picture from Gallery</string>
-    <string name="restore_default_str">Reset</string>
-    <string name="hue_str">Hue: <xliff:g id="hue_value">%1$s</xliff:g></string>
-    <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-    <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-    <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-
-    <string name="screen_color_standard">Standard</string>
-    <string name="screen_color_vivid">Vivid</string>
-    <string name="screen_color_custom">Custom</string>
-
     <!-- LiveDisplay -->
     <string name="live_display_title" translatable="false">LiveDisplay</string>
     <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index a2ad7d0..69707e3 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -50,42 +50,6 @@
     <!-- Config to enable duplicate APN checking. When true, disallows adding new duplicate APNs -->
     <bool name="config_enable_duplicate_apn_checking">false</bool>
 
-    <!-- This used to define screen color's Hue progress bar minimum value -->
-    <integer name="minimum_hue_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's Hue progress bar maximum value-->
-    <integer name="maximum_hue_value" translatable="false">360</integer>
-
-    <!-- This is used to define screen color's Hue progress bar default value-->
-    <integer name="default_hue_value" translatable="false">180</integer>
-
-    <!-- This is used to define screen color's saturation progress bar minimum value-->
-    <integer name="minimum_saturation_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's saturation progress bar maximum value-->
-    <integer name="maximum_saturation_value" translatable="false">360</integer>
-
-    <!-- This is used to define screen color's saturation progress bar default value-->
-    <integer name="default_saturation_value" translatable="false">180</integer>
-
-    <!-- This is used to define screen color's intensity progress bar minimum value-->
-    <integer name="minimum_intensity_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's intensity progress bar maximum value-->
-    <integer name="maximum_intensity_value" translatable="false">400</integer>
-
-    <!-- This is used to define screen color's intensity progress bar default value-->
-    <integer name="default_intensity_value" translatable="false">200</integer>
-
-    <!-- This is used to define screen color's contrast progress bar minimum value-->
-    <integer name="minimum_contrast_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's contrast progress bar default value-->
-    <integer name="default_contrast_value" translatable="false">180</integer>
-
-    <!-- This is used to define screen color's contrast progress bar maximum value-->
-    <integer name="maximum_contrast_value" translatable="false">360</integer>
-
     <!-- Metrics server endpoints -->
     <string name="stats_cm_url">https://stats.cyanogenmod.org/submit</string>
     <string name="stats_cyanogen_url">https://shopvac.cyngn.com/community/heartbeat</string>
diff --git a/src/com/android/display/IPPService.aidl b/src/com/android/display/IPPService.aidl
deleted file mode 100644
index c934efe..0000000
--- a/src/com/android/display/IPPService.aidl
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.android.display;
-interface IPPService {
-    boolean startPP();
-    boolean stopPP();
-    boolean updateHSIC(int h, int s, int i, int c);
-    boolean getPPStatus();
-}
diff --git a/src/com/android/settings/CustomScreenColor.java b/src/com/android/settings/CustomScreenColor.java
deleted file mode 100644
index 2d6c7c2..0000000
--- a/src/com/android/settings/CustomScreenColor.java
+++ /dev/null
@@ -1,721 +0,0 @@
-/*
-   Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.android.settings;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-import android.widget.RelativeLayout;
-import android.widget.SeekBar;
-import android.widget.TextView;
-import android.widget.PopupWindow;
-
-import com.android.display.IPPService;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class CustomScreenColor extends Activity implements SeekBar.OnSeekBarChangeListener,
-        View.OnClickListener {
-    private final static String TAG = "CustomScreenColor";
-
-    private static final int RESTORE_DEFAULT_PREVIEW = 0;
-    private static final int SELECT_NEW_FILE_ITEM = 1;
-    private static final int SELECT_FILE_ITEM = 2;
-    private static final int RESET = 3;
-    private static final int SELECT_FILE_GROUP1 = 0;
-    private static final int SELECT_FILE_GROUP2 = 1;
-    private static final int SELECT_FILE_ORDER = 0;
-    private static final int REQUEST_SELECT_FILE = 100;
-    private static final String IMAGE_UNSPECIFIED = "image/*";
-    private static final String PREVIEW_STRING_KEY = "screencolor_preview_key";
-    private static final String PREVIEW_STRING_NAME = "screencolor_preview_name";
-    private static final String COLOR_HUE = "hue";
-    private static final String COLOR_SATURATION = "saturation";
-    private static final String COLOR_INTENSITY = "intensity";
-    private static final String COLOR_CONTRAST = "contrast";
-
-    private static final String KEY_ASPECT_X = "aspectX";
-    private static final String KEY_ASPECT_Y = "aspectY";
-    private static final String KEY_SPOTLIGHT_X = "spotlightX";
-    private static final String KEY_SPOTLIGHT_Y = "spotlightY";
-    private static final String KEY_FROME_SCREENCOLOR = "fromScreenColor";
-
-    private ImageView mImageView;
-    private RelativeLayout mRLayout;
-    private LinearLayout mScreenColorLayout;
-    private SeekBar mHBar, mSBar, mCBar, mIBar;
-    private TextView mHTv, mSTv, mCTv, mITv;
-    private ImageView mReduceH, mIncreaseH, mReduceS, mIncreaseS, mReduceC, mIncreaseC, mReduceI,
-            mIncreaseI, mUpdown, mMore;
-    private Button mCancelBtn, mSaveBtn, mPreviousBtn, mNewBtn;
-    private boolean canRestorePreview;
-    private int mHueValue = 0;
-    private int mSaturationValue = 0;
-    private int mIntensityValue = 0;
-    private int mContrastValue = 0;
-
-    private int mMinHueValue = 0;
-    private int mMaxHueValue = 0;
-    private int mDefaultHueValue = 0;
-    private int mMinSaturationValue = 0;
-    private int mMaxSaturationValue = 0;
-    private int mDefaultSaturationValue = 0;
-    private int mMinIntensityValue = 0;
-    private int mMaxIntensityValue = 0;
-    private int mDefaultIntensityValue = 0;
-    private int mMinContrastValue = 0;
-    private int mMaxContrastValue = 0;
-    private int mDefaultContrastValue = 0;
-
-    /**
-     *  It is used to update the screen's hue, saturation, contrast, and intensity.
-     */
-    IPPService mPPService = null;
-    PPServiceConnection mPPServiceConn = null;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initPPService();
-        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
-        setContentView(R.layout.custom_screencolor);
-        initView();
-        restoreSavedHSCI(true);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        unbindService(mPPServiceConn);
-    }
-
-    private void initView() {
-        ActionBar actionBar = getActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-
-        mMinHueValue = getResources().getInteger(R.integer.minimum_hue_value);
-        mMaxHueValue = getResources().getInteger(R.integer.maximum_hue_value);
-        mDefaultHueValue = getResources().getInteger(R.integer.default_hue_value);
-        mMinSaturationValue = getResources().getInteger(R.integer.minimum_saturation_value);
-        mMaxSaturationValue = getResources().getInteger(R.integer.maximum_saturation_value);
-        mDefaultSaturationValue = getResources().getInteger(R.integer.default_saturation_value);
-        mMinIntensityValue = getResources().getInteger(R.integer.minimum_intensity_value);
-        mMaxIntensityValue = getResources().getInteger(R.integer.maximum_intensity_value);
-        mDefaultIntensityValue = getResources().getInteger(R.integer.default_intensity_value);
-        mMinContrastValue = getResources().getInteger(R.integer.minimum_contrast_value);
-        mMaxContrastValue = getResources().getInteger(R.integer.maximum_contrast_value);
-        mDefaultContrastValue = getResources().getInteger(R.integer.default_contrast_value);
-
-        mRLayout = (RelativeLayout) findViewById(R.id.background_preview);
-        String previewContent = getScreenColorPreviewKey();
-        if ("".equals(previewContent)) {
-            resotreBackgroundByDefault();
-        } else {
-            Uri previewUri = Uri.parse(previewContent);
-            setBackgroundByUri(previewUri);
-        }
-
-        mScreenColorLayout = (LinearLayout) findViewById(R.id.screencolor_control);
-        mScreenColorLayout.setBackgroundColor(R.color.screencolor_background);
-        mScreenColorLayout.setOnClickListener(this);
-
-        mHBar = (SeekBar) findViewById(R.id.hcontrol);
-        mHBar.setMax(mMaxHueValue);
-        mHBar.setOnSeekBarChangeListener(this);
-        mSBar = (SeekBar) findViewById(R.id.scontrol);
-        mSBar.setMax(mMaxSaturationValue);
-        mSBar.setOnSeekBarChangeListener(this);
-        mIBar = (SeekBar) findViewById(R.id.icontrol);
-        mIBar.setMax(mMaxIntensityValue);
-        mIBar.setOnSeekBarChangeListener(this);
-        mCBar = (SeekBar) findViewById(R.id.ccontrol);
-        mCBar.setMax(mMaxContrastValue);
-        mCBar.setOnSeekBarChangeListener(this);
-
-        mHTv = (TextView) findViewById(R.id.hue);
-        mHTv.setText(getString(R.string.hue_str, mHBar.getProgress()));
-        mSTv = (TextView) findViewById(R.id.saturation);
-        mSTv.setText(getString(R.string.saturation_str, mSBar.getProgress()));
-        mITv = (TextView) findViewById(R.id.intensity);
-        mITv.setText(getString(R.string.intensity_str, mIBar.getProgress()));
-        mCTv = (TextView) findViewById(R.id.contrast);
-        mCTv.setText(getString(R.string.contrast_str, mCBar.getProgress()));
-
-        mReduceH = (ImageView) findViewById(R.id.reduce_hue);
-        mReduceH.setOnClickListener(this);
-        mIncreaseH = (ImageView) findViewById(R.id.increase_hue);
-        mIncreaseH.setOnClickListener(this);
-        mReduceS = (ImageView) findViewById(R.id.reduce_saturation);
-        mReduceS.setOnClickListener(this);
-        mIncreaseS = (ImageView) findViewById(R.id.increase_saturation);
-        mIncreaseS.setOnClickListener(this);
-        mReduceI = (ImageView) findViewById(R.id.reduce_intensity);
-        mReduceI.setOnClickListener(this);
-        mIncreaseI = (ImageView) findViewById(R.id.increase_intensity);
-        mIncreaseI.setOnClickListener(this);
-        mReduceC = (ImageView) findViewById(R.id.reduce_contrast);
-        mReduceC.setOnClickListener(this);
-        mIncreaseC = (ImageView) findViewById(R.id.increase_contrast);
-        mIncreaseC.setOnClickListener(this);
-
-        mUpdown = (ImageView) findViewById(R.id.up_down);
-        mUpdown.setOnClickListener(this);
-        mMore = (ImageView) findViewById(R.id.more);
-        mMore.setOnClickListener(this);
-
-        mPreviousBtn = (Button) findViewById(R.id.previous_btn);
-        mPreviousBtn.setOnClickListener(this);
-        mNewBtn = (Button) findViewById(R.id.new_btn);
-        mNewBtn.setOnClickListener(this);
-        mCancelBtn = (Button) findViewById(R.id.cancel);
-        mCancelBtn.setOnClickListener(this);
-        mSaveBtn = (Button) findViewById(R.id.save);
-        mSaveBtn.setOnClickListener(this);
-
-        initBtnsStatus();
-    }
-
-    private void initPPService() {
-        mPPServiceConn = new PPServiceConnection();
-        String packetname = "com.qualcomm.display";
-        String service = "com.qualcomm.display.PPService";
-        Intent i = new Intent(IPPService.class.getName());
-
-        ComponentName component = new ComponentName(packetname, service);
-        i.setComponent(component);
-
-        boolean ret = bindService(i, mPPServiceConn, Context.BIND_AUTO_CREATE);
-    }
-
-    private class PPServiceConnection implements ServiceConnection {
-
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mPPService = IPPService.Stub.asInterface((IBinder) service);
-            Log.d(TAG, "onServiceConnected, service=" + mPPService);
-            try {
-                if (null != mPPService) {
-                    mPPService.startPP();
-                    restoreSavedHSCI(true);
-                }
-            } catch (RemoteException e) {
-                Log.e(TAG, "startPP exception");
-            }
-
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            if (null != mPPService) {
-                // end thread
-                try {
-                    Log.d(TAG, "stopPP");
-                    mPPService.stopPP();
-                } catch (RemoteException e) {
-                    Log.e(TAG, "stopPP exception");
-                }
-            }
-            mPPService = null;
-        }
-
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode != RESULT_OK) {
-            Log.i(TAG, "bail due to resultCode=" + resultCode);
-            return;
-        }
-        switch (requestCode) {
-            case REQUEST_SELECT_FILE:
-                changePreviewByData(data);
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add(SELECT_FILE_GROUP1, SELECT_FILE_ITEM, SELECT_FILE_ORDER,
-                R.string.selectfile_menu);
-        menu.add(SELECT_FILE_GROUP1, RESET, SELECT_FILE_ORDER, R.string.restore_default_str);
-        menu.add(SELECT_FILE_GROUP2, RESTORE_DEFAULT_PREVIEW, SELECT_FILE_ORDER,
-                R.string.restore_preview);
-        menu.add(SELECT_FILE_GROUP2, SELECT_NEW_FILE_ITEM, SELECT_FILE_ORDER,
-                R.string.selectnewfile_menu);
-        menu.add(SELECT_FILE_GROUP2, RESET, SELECT_FILE_ORDER, R.string.restore_default_str);
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (canRestorePreview) {
-            menu.setGroupVisible(SELECT_FILE_GROUP1, false);
-            menu.setGroupVisible(SELECT_FILE_GROUP2, true);
-        } else {
-            menu.setGroupVisible(SELECT_FILE_GROUP1, true);
-            menu.setGroupVisible(SELECT_FILE_GROUP2, false);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                break;
-            case SELECT_NEW_FILE_ITEM:
-                selectPicFromGallery2();
-                break;
-            case SELECT_FILE_ITEM:
-                selectPicFromGallery2();
-                break;
-            case RESTORE_DEFAULT_PREVIEW:
-                resotreBackgroundByDefault();
-                break;
-            case RESET:
-                restoreDefaultHSCI();
-                break;
-            default:
-                return true;
-        }
-        return false;
-    }
-
-    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-        setNewBtnHighlight();
-        int id = seekBar.getId();
-        switch (id) {
-            case R.id.hcontrol:
-                mHueValue = progress;
-                //The screen hue display value varies from -180 to 180.
-                mHTv.setText(getString(R.string.hue_str, progress - 180));
-                break;
-            case R.id.scontrol:
-                mSaturationValue = progress;
-                //Change the saturation display value varies from (-180, 180) to (-1.0, 1.0).
-                mSTv.setText(getString(R.string.saturation_str,
-                        ((int) (((progress - 180) * 100) / 180.0)) / 100.0));
-                break;
-            case R.id.ccontrol:
-                mContrastValue = progress;
-                //Change the contrast display value varies from (-180, 180) to (-1.0, 1.0).
-                mCTv.setText(getString(R.string.contrast_str,
-                        ((int) (((progress - 180) * 100) / 180.0)) / 100.0));
-                break;
-            case R.id.icontrol:
-                mIntensityValue = progress;
-                //The screen intensity display value varies from -200 to 200.
-                mITv.setText(getString(R.string.intensity_str, progress - 200));
-                break;
-            default:
-                break;
-
-        }
-        Log.i(TAG, "onProgressChanged mHueValue=" + mHueValue + " mSaturationValue="
-                + mSaturationValue + " mNewContrastValue=" + mContrastValue + " mIntensityValue="
-                + mIntensityValue);
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(mHueValue, mSaturationValue, mIntensityValue,
-                                     mContrastValue);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    public void onStartTrackingTouch(SeekBar seekBar) {
-        setActivated(seekBar, true);
-    }
-
-    public void onStopTrackingTouch(SeekBar seekBar) {
-        setActivated(seekBar, false);
-    }
-
-    private void setActivated(SeekBar seekBar, boolean isActivated) {
-        int id = seekBar.getId();
-        switch (id) {
-            case R.id.hcontrol:
-                mReduceH.setActivated(isActivated);
-                mIncreaseH.setActivated(isActivated);
-                break;
-            case R.id.scontrol:
-                mReduceS.setActivated(isActivated);
-                mIncreaseS.setActivated(isActivated);
-                break;
-            case R.id.icontrol:
-                mReduceI.setActivated(isActivated);
-                mIncreaseI.setActivated(isActivated);
-                break;
-            case R.id.ccontrol:
-                mReduceC.setActivated(isActivated);
-                mIncreaseC.setActivated(isActivated);
-                break;
-            default:
-                break;
-        }
-
-    }
-
-    public void onClick(View v) {
-        int id = v.getId();
-
-        switch (id) {
-            case R.id.cancel:
-                restoreSavedHSCI(false);
-                finish();
-                break;
-            case R.id.save:
-                saveHSCI();
-                break;
-            case R.id.previous_btn:
-                previousOrNewHSCI(true);
-                break;
-            case R.id.new_btn:
-                previousOrNewHSCI(false);
-                break;
-            case R.id.up_down:
-                upDownHSCISettingLayout();
-                break;
-            case R.id.more:
-                showMoreMenus();
-                break;
-            case R.id.reduce_hue:
-                mHBar.setProgress((mHueValue - 1 > mMinHueValue) ? (mHueValue - 1) : mMinHueValue);
-                break;
-            case R.id.increase_hue:
-                mHBar.setProgress((mHueValue + 1 < mMaxHueValue) ? (mHueValue + 1) : mMaxHueValue);
-                break;
-            case R.id.reduce_saturation:
-                mSBar.setProgress((mSaturationValue - 1 > mMinSaturationValue) ?
-                    (mSaturationValue - 1) : mMinSaturationValue);
-                break;
-            case R.id.increase_saturation:
-                mSBar.setProgress((mSaturationValue + 1 < mMaxSaturationValue) ?
-                    (mSaturationValue + 1) : mMaxSaturationValue);
-                break;
-            case R.id.reduce_intensity:
-                mIBar.setProgress((mIntensityValue - 1 > mMinIntensityValue) ?
-                    (mIntensityValue - 1) : mMinIntensityValue);
-                break;
-            case R.id.increase_intensity:
-                mIBar.setProgress((mIntensityValue + 1 < mMaxIntensityValue) ?
-                    (mIntensityValue + 1) : mMaxIntensityValue);
-                break;
-            case R.id.reduce_contrast:
-                mCBar.setProgress((mContrastValue - 1 > mMinContrastValue) ?
-                    (mContrastValue - 1) : mMinContrastValue);
-                break;
-            case R.id.increase_contrast:
-                mCBar.setProgress((mContrastValue + 1 < mMaxContrastValue) ?
-                    (mContrastValue + 1) : mMaxContrastValue);
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void selectPicFromGallery2() {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("image/*");
-        startActivityForResult(intent, REQUEST_SELECT_FILE);
-    }
-
-    private void restoreDefaultHSCI() {
-        mHBar.setProgress(mDefaultHueValue);
-        mSBar.setProgress(mDefaultSaturationValue);
-        mIBar.setProgress(mDefaultIntensityValue);
-        mCBar.setProgress(mDefaultContrastValue);
-        setNewBtnHighlight();
-    }
-
-    private void restoreSavedHSCI(boolean setProgress) {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME,
-                Context.MODE_WORLD_WRITEABLE);
-        int hueValue = share.getInt(COLOR_HUE, mDefaultHueValue);
-        int saturationValue = share.getInt(COLOR_SATURATION, mDefaultSaturationValue);
-        int intensityValue = share.getInt(COLOR_INTENSITY, mDefaultIntensityValue);
-        int contrastValue = share.getInt(COLOR_CONTRAST, mDefaultContrastValue);
-        if (setProgress) {
-            mHBar.setProgress(hueValue);
-            mSBar.setProgress(saturationValue);
-            mIBar.setProgress(intensityValue);
-            mCBar.setProgress(contrastValue);
-        }
-        Log.i(TAG, "restoreSavedHSCI hueValue=" + hueValue + " saturationValue=" + saturationValue
-                + " contrastValue=" + contrastValue + " intensityValue=" + intensityValue);
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(hueValue, saturationValue, intensityValue, contrastValue);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    private void previewNewHSIC() {
-        mHBar.setProgress(mHueValue);
-        mSBar.setProgress(mSaturationValue);
-        mIBar.setProgress(mIntensityValue);
-        mCBar.setProgress(mContrastValue);
-        Log.i(TAG, "previewNewHSIC mHueValue=" + mHueValue + " mSaturationValue="
-                + mSaturationValue + " mContrastValue=" + mContrastValue + " mIntensityValue="
-                + mIntensityValue);
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(mHueValue, mSaturationValue, mIntensityValue,
-                        mContrastValue);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    private void setNewBtnHighlight() {
-        mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_default);
-        mNewBtn.setBackgroundResource(R.drawable.ic_new_glow);
-        mPreviousBtn.setEnabled(true);
-        mNewBtn.setEnabled(true);
-        mSaveBtn.setEnabled(true);
-
-    }
-
-    private void initBtnsStatus() {
-        mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_dis);
-        mNewBtn.setBackgroundResource(R.drawable.ic_new_dis);
-        mPreviousBtn.setEnabled(false);
-        mNewBtn.setEnabled(false);
-        mSaveBtn.setEnabled(false);
-    }
-
-    private void previousOrNewHSCI(boolean isPrevious) {
-        if (View.GONE != mScreenColorLayout.getVisibility()) {
-            mScreenColorLayout.setVisibility(View.GONE);
-            mUpdown.setBackgroundResource(R.drawable.up_button);
-        }
-        if (isPrevious) {
-            mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_glow);
-            mNewBtn.setBackgroundResource(R.drawable.ic_new_default);
-            mUpdown.setVisibility(View.GONE);
-            mMore.setVisibility(View.GONE);
-            restoreSavedHSCI(false);
-        } else {
-            mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_default);
-            mNewBtn.setBackgroundResource(R.drawable.ic_new_glow);
-            mUpdown.setVisibility(View.VISIBLE);
-            mMore.setVisibility(View.VISIBLE);
-            previewNewHSIC();
-        }
-    }
-
-    private void saveHSCI() {
-        // TODO save HSCI values.
-        saveHSICPreference(mHueValue, mSaturationValue, mIntensityValue, mContrastValue);
-        finish();
-    }
-
-    private void changePreviewByData(Intent data) {
-        if (data != null) {
-            Uri uri = data.getData();
-            setBackgroundByUri(uri);
-            savePreviewKey(uri.toString());
-        }
-    }
-
-    private void setBackgroundByUri(Uri uri) {
-        InputStream is = null;
-        try {
-            is = getContentResolver().openInputStream(uri);
-            BitmapFactory.Options opts = new BitmapFactory.Options();
-            opts.inJustDecodeBounds = true;
-            BitmapFactory.decodeStream(is, null, opts);
-            is.close();
-            is = getContentResolver().openInputStream(uri);
-            opts.inJustDecodeBounds = false;
-            opts.inSampleSize = calculateInSampleSize(opts,
-                    mRLayout.getWidth(), mRLayout.getHeight());
-            Bitmap bm = BitmapFactory.decodeStream(is, null, opts);
-            BitmapDrawable bd = new BitmapDrawable(bm);
-            mRLayout.setBackgroundDrawable(bd);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        canRestorePreview = true;
-    }
-
-    public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
-        // Raw height and width of image
-        final int height = options.outHeight;
-        final int width = options.outWidth;
-        int inSampleSize = 1;
-
-        if (height > reqHeight || width > reqWidth) {
-
-            final int halfHeight = height / 2;
-            final int halfWidth = width / 2;
-
-            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
-            // height and width larger than the requested height and width.
-            while ((halfHeight / inSampleSize) > reqHeight
-                    && (halfWidth / inSampleSize) > reqWidth) {
-                inSampleSize *= 2;
-            }
-        }
-
-        return inSampleSize;
-    }
-
-    private void resotreBackgroundByDefault() {
-        mRLayout.setBackgroundResource(R.drawable.default_screencolor_setting);
-        savePreviewKey("");
-        canRestorePreview = false;
-    }
-
-    // use sharepreference to save preview image.
-    private void savePreviewKey(String value) {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE);
-        Editor editor = share.edit();
-        editor.putString(PREVIEW_STRING_KEY, value);
-        editor.commit();
-    }
-
-    private void saveHSICPreference(int h, int s, int i, int c) {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE);
-        Editor editor = share.edit();
-        editor.putInt(COLOR_HUE, h);
-        editor.putInt(COLOR_SATURATION, s);
-        editor.putInt(COLOR_INTENSITY, i);
-        editor.putInt(COLOR_CONTRAST, c);
-        editor.commit();
-    }
-
-    private String getScreenColorPreviewKey() {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME,
-                Context.MODE_WORLD_WRITEABLE | Context.MODE_WORLD_READABLE);
-        return share.getString(PREVIEW_STRING_KEY, "");
-    }
-
-    private void upDownHSCISettingLayout() {
-        if (View.GONE != mScreenColorLayout.getVisibility()) {
-            mScreenColorLayout.setVisibility(View.GONE);
-            mUpdown.setBackgroundResource(R.drawable.up_button);
-        } else {
-            mScreenColorLayout.setVisibility(View.VISIBLE);
-            mUpdown.setBackgroundResource(R.drawable.down_button);
-        }
-    }
-
-    private void showMoreMenus() {
-        PopupMenu popup = new PopupMenu(CustomScreenColor.this, mMore);
-        Menu menu = popup.getMenu();
-        popup.getMenuInflater().inflate(R.menu.screencolor_more, menu);
-
-        if (canRestorePreview) {
-            menu.removeItem(R.id.selectfile_menu);
-        } else {
-            menu.removeItem(R.id.restore_preview);
-            menu.removeItem(R.id.selectnewfile_menu);
-        }
-
-        popup.setOnMenuItemClickListener(new MyMenuItemclick());
-        popup.show();
-    }
-
-    private class MyMenuItemclick implements OnMenuItemClickListener {
-        @Override
-        public boolean onMenuItemClick(MenuItem item) {
-            switch (item.getItemId()) {
-                case R.id.restore_preview:
-                    resotreBackgroundByDefault();
-                    return true;
-                case R.id.selectnewfile_menu:
-                    selectPicFromGallery2();
-                    return true;
-                case R.id.selectfile_menu:
-                    selectPicFromGallery2();
-                    return true;
-                case R.id.restore_default_str:
-                    restoreDefaultHSCI();
-                    return true;
-            }
-            return true;
-        }
-    }
-}
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index ef7f9c3..f01f1e8 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -52,8 +52,6 @@ import android.app.UiModeManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.hardware.Sensor;
diff --git a/src/com/android/settings/ScreenColorSettings.java b/src/com/android/settings/ScreenColorSettings.java
deleted file mode 100644
index 4d4caaa..0000000
--- a/src/com/android/settings/ScreenColorSettings.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-   Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.android.settings;
-
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.RadioButton;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-import android.widget.RadioGroup;
-import android.widget.RelativeLayout;
-import android.widget.SeekBar;
-import android.widget.TextView;
-import android.widget.PopupWindow;
-
-import com.android.display.IPPService;
-
-public class ScreenColorSettings extends Activity {
-    private final static String TAG = "ScreenColorSettings";
-    private final static boolean DEBUG = false;
-
-    private final static int MODE_STANDARD = 0;
-    private final static int MODE_VIVID    = 1;
-    private final static int MODE_CUSTOM   = 2;
-
-    private static final String COLOR_MODE       = "mode";
-    private static final String COLOR_HUE        = "hue";
-    private static final String COLOR_SATURATION = "saturation";
-    private static final String COLOR_INTENSITY  = "intensity";
-    private static final String COLOR_CONTRAST   = "contrast";
-
-    private static final String PREVIEW_STRING_NAME = "screencolor_preview_name";
-
-    private int mMode = 0;
-    private IPPService mPPService = null;
-    private PPServiceConnection mPPServiceConn = null;
-    private SharedPreferences mSharedPreference;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initPPService();
-        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
-        setContentView(R.layout.screencolor_settings);
-
-        ListView listView = (ListView)findViewById(R.id.mode_list);
-        listView.setBackgroundColor(R.color.screencolor_background);
-        mSharedPreference = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE);
-        mMode = mSharedPreference.getInt(COLOR_MODE, 0);
-        setScreenColorMode(mMode);
-        String[] list = getResources().getStringArray(R.array.screen_color_setting);
-        ColorModeAdaper adapter = new ColorModeAdaper(this,
-                R.layout.screen_color_item, list);
-        listView.setAdapter(adapter);
-    }
-
-    private class ColorModeAdaper extends ArrayAdapter<String> {
-        private int mResource;
-        private RelativeLayout mItemView;
-
-        public ColorModeAdaper(Context context, int resource, String[] list) {
-            super(context, resource, list);
-            this.mResource = resource;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            String name = getItem(position);
-            if(convertView == null) {
-                mItemView = new RelativeLayout(getContext());
-                LayoutInflater vi = (LayoutInflater)getContext()
-                        .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-                vi.inflate(mResource, mItemView, true);
-            } else {
-                mItemView = (RelativeLayout) convertView;
-            }
-            ((TextView) mItemView.findViewById(android.R.id.title)).setText(name);
-
-            RadioButton radioButton = (RadioButton) mItemView.findViewById(android.R.id.button1);
-            ImageView setting = (ImageView) mItemView.findViewById(android.R.id.button2);
-            if (mMode == position) {
-                radioButton.setChecked(true);
-                setting.setEnabled(true);
-            } else {
-                radioButton.setChecked(false);
-                setting.setEnabled(false);
-            }
-
-            if (position != getCount()-1) {
-                ((ImageView) mItemView.findViewById(R.id.divider)).setVisibility(View.INVISIBLE);
-                setting.setVisibility(View.INVISIBLE);
-            } else {
-                setting.setOnClickListener(new OnClickListener () {
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent();
-                        intent.setClass(ScreenColorSettings.this, CustomScreenColor.class);
-                        startActivity(intent);
-                    }});
-            }
-
-            View v = mItemView.findViewById(R.id.widget_frame);
-            v.setTag(position);
-            v.setOnClickListener(new OnClickListener () {
-                @Override
-                public void onClick(View v) {
-                    int mode = (Integer)(v.getTag());
-                    setScreenColorMode(mode);
-                    notifyDataSetChanged();
-                }});
-            return mItemView;
-        }
-    }
-
-    private void initPPService() {
-        mPPServiceConn = new PPServiceConnection();
-        String packetname = "com.qualcomm.display";
-        String service = "com.qualcomm.display.PPService";
-        Intent i = new Intent(IPPService.class.getName());
-
-        ComponentName component = new ComponentName(packetname, service);
-        i.setComponent(component);
-
-        bindService(i, mPPServiceConn, Context.BIND_AUTO_CREATE);
-    }
-
-    private class PPServiceConnection implements ServiceConnection {
-
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mPPService = IPPService.Stub.asInterface((IBinder) service);
-            if (DEBUG) Log.d(TAG, "onServiceConnected, service=" + mPPService);
-            try {
-                if (null != mPPService) {
-                    mPPService.startPP();
-                    setScreenColorMode(mMode);
-                }
-            } catch (RemoteException e) {
-                Log.e(TAG, "startPP exception");
-            }
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            if (null != mPPService) {
-                try {
-                    mPPService.stopPP();
-                } catch (RemoteException e) {
-                    Log.e(TAG, "stopPP exception");
-                }
-            }
-            mPPService = null;
-        }
-
-    }
-
-    private void setScreenColorMode(int mode) {
-        if (DEBUG) Log.i(TAG, "setScreenColorMode mode = " + mode);
-        int hue = 0;
-        int saturation = 0;
-        int intensity = 0;
-        int contrast = 0;
-        switch (mode) {
-            case MODE_STANDARD:
-                hue = 180;
-                saturation = 180;
-                intensity = 255;
-                contrast = 180;
-                break;
-            case MODE_VIVID:
-                hue = 180;
-                saturation = 210;
-                intensity = 255;
-                contrast = 180;
-                break;
-            case MODE_CUSTOM:
-                hue = mSharedPreference.getInt(COLOR_HUE, 180);
-                saturation = mSharedPreference.getInt(COLOR_SATURATION, 180);
-                intensity = mSharedPreference.getInt(COLOR_INTENSITY, 255);
-                contrast = mSharedPreference.getInt(COLOR_CONTRAST, 180);
-                break;
-            default:
-                break;
-        }
-        saveModeValue(mode);
-        updateHSCIValue(hue, saturation, intensity, contrast);
-    }
-
-    private void updateHSCIValue(int hue, int saturation, int intensity, int contrast) {
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(hue, saturation, intensity, contrast);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        unbindService(mPPServiceConn);
-    }
-
-    private void saveModeValue(int mode) {
-        mMode = mode;
-        Editor editor = mSharedPreference.edit();
-        editor.putInt(COLOR_MODE, mode);
-        editor.commit();
-    }
-}
-- 
cgit v1.1