Remove white balance, effects, ISO, and brightness from setting.

2 files changed, 0 insertions, 161 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a451cf7..2e68140 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -42,58 +42,6 @@
         <item>30</item>
     </string-array>
 
-    <!-- Camera Preferences White Balance dialog box entries -->
-    <string-array name="pref_camera_whitebalance_entries">
-        <item>@string/pref_camera_whitebalance_entry_auto</item>
-        <item>@string/pref_camera_whitebalance_entry_incandescent</item>
-        <item>@string/pref_camera_whitebalance_entry_daylight</item>
-        <item>@string/pref_camera_whitebalance_entry_fluorescent</item>
-        <item>@string/pref_camera_whitebalance_entry_cloudy</item>
-        <item>@string/pref_camera_whitebalance_entry_twilight</item>
-        <item>@string/pref_camera_whitebalance_entry_shade</item>
-    </string-array>
-
-    <!-- Do not localize entryvalues -->
-    <string-array name="pref_camera_whitebalance_entryvalues">
-        <item>auto</item>
-        <item>incandescent</item>
-        <item>daylight</item>
-        <item>fluorescent</item>
-        <item>cloudy</item>
-        <item>twilight</item>
-        <item>shade</item>
-    </string-array>
-
-    <!-- Camera Preferences Effect dialog box entries -->
-    <string-array name="pref_camera_effect_entries">
-        <item>@string/pref_camera_effect_entry_off</item>
-        <item>@string/pref_camera_effect_entry_mono</item>
-        <item>@string/pref_camera_effect_entry_sepia</item>
-        <item>@string/pref_camera_effect_entry_negative</item>
-        <item>@string/pref_camera_effect_entry_solarize</item>
-        <item>@string/pref_camera_effect_entry_posterize</item>
-        <item>@string/pref_camera_effect_entry_whiteboard</item>
-        <item>@string/pref_camera_effect_entry_blackboard</item>
-        <item>@string/pref_camera_effect_entry_aqua</item>
-        <item>@string/pref_camera_effect_entry_pastel</item>
-        <item>@string/pref_camera_effect_entry_mosaic</item>
-    </string-array>
-
-    <!-- Do not localize entryvalues -->
-    <string-array name="pref_camera_effect_entryvalues">
-        <item>off</item>
-        <item>mono</item>
-        <item>sepia</item>
-        <item>negative</item>
-        <item>solarize</item>
-        <item>posterize</item>
-        <item>whiteboard</item>
-        <item>blackboard</item>
-        <item>aqua</item>
-        <item>pastel</item>
-        <item>mosaic</item>
-    </string-array>
-
     <!-- Camera Preferences Picture size dialog box entries -->
     <string-array name="pref_camera_picturesize_entries">
         <item>@string/pref_camera_picturesize_entry_2048x1536</item>
@@ -134,47 +82,4 @@
         <item>@string/pref_camera_focusmode_value_infinity</item>
     </string-array>
 
-    <!-- Camera Preferences brightness dialog box entries.
-         This should be changed when we have a better UI.
-    -->
-    <string-array name="pref_camera_brightness_entries">
-        <item>Level 0 (Darkest)</item>
-        <item>Level 1</item>
-        <item>Level 2</item>
-        <item>Level 3</item>
-        <item>Level 4</item>
-        <item>Level 5</item>
-        <item>Level 6</item>
-        <item>Level 7</item>
-        <item>Level 8</item>
-        <item>Level 9</item>
-        <item>Level 10 (Brightest)</item>
-    </string-array>
-
-    <!-- Do not localize entryvalues -->
-    <string-array name="pref_camera_brightness_entryvalues">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-    </string-array>
-
-    <!-- Camera Preferences ISO dialog box entries -->
-    <string-array name="pref_camera_iso_entries">
-        <item>@string/pref_camera_iso_entry_auto</item>
-        <item>@string/pref_camera_iso_entry_high</item>
-    </string-array>
-
-    <!-- Do not localize entryvalues -->
-    <string-array name="pref_camera_iso_entryvalues">
-        <item>@string/pref_camera_iso_value_auto</item>
-        <item>@string/pref_camera_iso_value_high</item>
-    </string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7e483aa..538f7f3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -344,55 +344,6 @@
     <!-- Settings screen, Picture setting category title -->
     <string name="pref_camera_picture_settings_category">Picture settings</string>
 
-    <!-- Default white balance setting. Do not translate. -->
-    <string name="pref_camera_whitebalance_default">auto</string>
-
-    <!-- Settings screen, Select White balance title -->
-    <string name="pref_camera_whitebalance_title">Select white balance</string>
-
-    <!-- Settings screen, White balance dialog radio button choices -->
-    <string name="pref_camera_whitebalance_entry_auto">Auto</string>
-    <string name="pref_camera_whitebalance_entry_incandescent">Incandescent</string>
-    <string name="pref_camera_whitebalance_entry_daylight">Daylight</string>
-    <string name="pref_camera_whitebalance_entry_fluorescent">Fluorescent</string>
-    <string name="pref_camera_whitebalance_entry_cloudy">Cloudy</string>
-    <string name="pref_camera_whitebalance_entry_twilight">Twilight</string>
-    <string name="pref_camera_whitebalance_entry_shade">Shade</string>
-
-    <!-- Settings screen, white balance dialog title -->
-    <string name="pref_camera_whitebalance_dialogtitle">White balance</string>
-
-    <!-- Default effect setting. Do not translate. -->
-    <string name="pref_camera_effect_default">off</string>
-
-    <!-- Settings screen, Select Effect title -->
-    <string name="pref_camera_effect_title">Select effect</string>
-
-    <!-- Settings screen, Effect dialog radio button choices -->
-    <string name="pref_camera_effect_entry_off">Off</string>
-    <string name="pref_camera_effect_entry_mono">Mono</string>
-    <string name="pref_camera_effect_entry_sepia">Sepia</string>
-    <string name="pref_camera_effect_entry_negative">Negative</string>
-    <string name="pref_camera_effect_entry_solarize">Solarize</string>
-    <string name="pref_camera_effect_entry_posterize">Posterize</string>
-    <string name="pref_camera_effect_entry_whiteboard">Whiteboard</string>
-    <string name="pref_camera_effect_entry_blackboard">Blackboard</string>
-    <string name="pref_camera_effect_entry_aqua">Aqua</string>
-    <string name="pref_camera_effect_entry_pastel">Pastel</string>
-    <string name="pref_camera_effect_entry_mosaic">Mosaic</string>
-
-    <!-- Settings screen, effect dialog title -->
-    <string name="pref_camera_effect_dialogtitle">Effect</string>
-
-    <!-- Default brightness setting. Do not translate. -->
-    <string name="pref_camera_brightness_default">5</string>
-
-    <!-- Settings screen, Select Brightness title -->
-    <string name="pref_camera_brightness_title">Select brightness</string>
-
-    <!-- Settings screen, brightness dialog title -->
-    <string name="pref_camera_brightness_dialogtitle">Brightness</string>
-
     <!-- Default picture size setting. Do not translate. -->
     <string name="pref_camera_picturesize_default">2048x1536</string>
 
@@ -438,23 +389,6 @@
     <!-- Settings screen, focus mode dialog title -->
     <string name="pref_camera_focusmode_dialogtitle">Focus mode</string>
 
-    <!-- Default iso setting. Do not translate. -->
-    <string name="pref_camera_iso_default">auto</string>
-
-    <!-- Settings screen, Select Iso title -->
-    <string name="pref_camera_iso_title">Select ISO</string>
-
-    <!-- Settings screen, ISO dialog radio button choices -->
-    <string name="pref_camera_iso_entry_auto">Auto</string>
-    <string name="pref_camera_iso_entry_high">High ISO</string>
-
-    <!-- ISO entry values. Do not translate. -->
-    <string name="pref_camera_iso_value_auto">auto</string>
-    <string name="pref_camera_iso_value_high">high</string>
-
-    <!-- Settings screen, ISO dialog title -->
-    <string name="pref_camera_iso_dialogtitle">ISO</string>
-
     <!-- Menu item to go to the settings screen -->
     <string name="camerasettings">Settings</string>