Make picture color mode less of a feature

- Shun it to developer settings
 - Hide 'natural' mode
 - Remove dialog

Bug: 24038268
Change-Id: Ibaf363bc06b444f2a361707b98742328fc290cfc

res/values/strings.xml

@@ -7026,4 +7026,7 @@
 
     <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
     <string name="picture_color_mode">Picture color mode</string>
+
+    <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+    <string name="picture_color_mode_desc">Use sRGB</string>
 </resources>

res/xml/development_prefs.xml

@@ -60,6 +60,12 @@
         android:summary="@string/runningservices_settings_summary"
         android:fragment="com.android.settings.applications.RunningServices" />
 
+    <com.android.settings.ColorModePreference
+        android:key="color_mode"
+        android:title="@string/picture_color_mode"
+        android:summary="@string/picture_color_mode_desc"
+        android:persistent="false" />
+
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">
 

res/xml/display_settings.xml

@@ -104,12 +104,6 @@
                 android:key="auto_rotate"
                 android:title="@string/display_auto_rotate_title" />
 
-        <com.android.settings.ColorModePreference
-                android:key="color_mode"
-                android:title="@string/picture_color_mode"
-                android:persistent="false"
-                settings:keywords="@string/keywords_color_mode" />
-
         <PreferenceScreen
                 android:key="wifi_display"
                 android:title="@string/wifi_display_settings_title"