Move inverted mode to Accessibility settings

Add contrast settings

bug:5111259

Change-Id: Ic95e1fbae94c01fc8560cbd326503244b9ab4988

4 files changed, 24 insertions, 14 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d9667bc..87e77fc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -524,6 +524,14 @@
     <string name="pref_force_userscalable">Force enable zoom</string>
     <!-- Summary for whether or not to force-enable user scalablity (aka, zoom) [CHAR LIMIT=30] -->
     <string name="pref_force_userscalable_summary">Whether or not to override a website\'s request to control zoom behavior</string>
+    <!-- Inverted screen category under accessibility settings [CHAR LIMIT=50] -->
+    <string name="pref_inverted_category">Inverted Screen Rendering</string>
+    <!-- Title for the inverted screen feature. This causes the screen to render with inverted colors (black becomes white and vice versa) [CHAR LIMIT=40] -->
+    <string name="pref_inverted">Inverted Rendering</string>
+    <!-- Summary for the inverted screen feature. [CHAR LIMIT=120] -->
+    <string name="pref_inverted_summary">Enable inverted rendering. Black will become white and vice versa.</string>
+    <!-- Title for the inverted screen contrast. Change the contrast value from 1.0 to 3.0. [CHAR LIMIT=30] -->
+    <string name="pref_inverted_contrast">Contrast</string>
     <!-- Settings label -->
     <string name="pref_default_zoom">Default zoom</string>
     <!-- Settings default zoom options; appear in default zoom dialog box -->
@@ -654,10 +662,6 @@
     <!-- Summary for the fullscreen lab feature [CHAR LIMIT=120] -->
     <string name="pref_lab_fullscreen_summary">
       Use fullscreen mode to hide the status bar.</string>
-    <!-- Title for the inverted screen lab feature. This causes the screen to render with inverted colors (black becomes white and vice versa) [CHAR LIMIT=40] -->
-    <string name="pref_lab_inverted">Inverted Rendering</string>
-    <!-- Summary for the inverted screen lab feature. [CHAR LIMIT=120] -->
-    <string name="pref_lab_inverted_summary">Checking this causes the browser to invert colors. Black will become white and vice versa.</string>
     <!-- Title for bandwidth management preference [CHAR LIMIT=25] -->
     <string name="pref_data_title">Bandwidth Management</string>
     <!-- Title for search preloading [CHAR LIMIT=40] -->
diff --git a/res/xml-sw600dp/lab_preferences.xml b/res/xml-sw600dp/lab_preferences.xml
index 512c8c1..0edc919 100644
--- a/res/xml-sw600dp/lab_preferences.xml
+++ b/res/xml-sw600dp/lab_preferences.xml
@@ -26,9 +26,4 @@
         android:defaultValue="false"
         android:title="@string/pref_use_instant_search"
         android:summary="@string/pref_use_instant_search_summary" />
-    <CheckBoxPreference
-        android:key="inverted"
-        android:defaultValue="false"
-        android:title="@string/pref_lab_inverted"
-        android:summary="@string/pref_lab_inverted_summary" />
 </PreferenceScreen>
diff --git a/res/xml/accessibility_preferences.xml b/res/xml/accessibility_preferences.xml
index a7124f4..db5a539 100644
--- a/res/xml/accessibility_preferences.xml
+++ b/res/xml/accessibility_preferences.xml
@@ -40,4 +40,20 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/pref_inverted_category">
+
+        <CheckBoxPreference
+            android:key="inverted"
+            android:defaultValue="false"
+            android:title="@string/pref_inverted"
+            android:summary="@string/pref_inverted_summary" />
+
+        <com.android.browser.preferences.FontSizePreference
+            android:key="inverted_contrast"
+            android:title="@string/pref_inverted_contrast"
+            android:defaultValue="0"
+            android:max="20" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/res/xml/lab_preferences.xml b/res/xml/lab_preferences.xml
index a3de6ca..3320cee 100644
--- a/res/xml/lab_preferences.xml
+++ b/res/xml/lab_preferences.xml
@@ -26,9 +26,4 @@
         android:defaultValue="false"
         android:title="@string/pref_lab_fullscreen"
         android:summary="@string/pref_lab_fullscreen_summary" />
-    <CheckBoxPreference
-        android:key="inverted"
-        android:defaultValue="false"
-        android:title="@string/pref_lab_inverted"
-        android:summary="@string/pref_lab_inverted_summary" />
 </PreferenceScreen>