Merge 5c05aaa8664172755c0f5cf6920e518a8abca067 on remote branch

Change-Id: I4b111d981352b99ff7f9e6c2dc43915d30aef16b

2 files changed, 0 insertions, 86 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 208c3257d..36c08b07d 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -18,34 +18,14 @@
 <resources>
     <!-- Camera Preferences Video Quality entries -->
     <string-array name="pref_video_quality_entries" translatable="false">
-        <item>@string/pref_video_quality_entry_4kdci</item>
-        <item>@string/pref_video_quality_entry_2160p</item>
-        <item>@string/pref_video_quality_entry_1080p</item>
         <item>@string/pref_video_quality_entry_720p</item>
         <item>@string/pref_video_quality_entry_480p</item>
-        <item>@string/pref_video_quality_entry_fwvga</item>
-        <item>@string/pref_video_quality_entry_wvga</item>
         <item>@string/pref_video_quality_entry_vga</item>
-        <item>@string/pref_video_quality_entry_hvga</item>
-        <item>@string/pref_video_quality_entry_wqvga</item>
-        <item>@string/pref_video_quality_entry_cif</item>
-        <item>@string/pref_video_quality_entry_qvga</item>
-        <item>@string/pref_video_quality_entry_qcif</item>
    </string-array>
     <string-array name="pref_video_quality_entryvalues" translatable="false">
-        <item>4096x2160</item>
-        <item>3840x2160</item>
-        <item>1920x1080</item>
         <item>1280x720</item>
         <item>720x480</item>
-        <item>864x480</item>
-        <item>800x480</item>
         <item>640x480</item>
-        <item>480x360</item>
-        <item>400x240</item>
-        <item>352x288</item>
-        <item>320x240</item>
-        <item>176x144</item>
     </string-array>
 
     <!-- Camera Preference save path entries -->
@@ -175,69 +155,21 @@
 
     <!-- Camera Preferences Picture size dialog box entries -->
     <string-array name="pref_camera_picturesize_entries" translatable="false">
-        <item>@string/pref_camera_picturesize_entry_20mp</item>
-        <item>@string/pref_camera_picturesize_entry_16mp</item>
-        <item>@string/pref_camera_picturesize_entry_13mp</item>
-        <item>@string/pref_camera_picturesize_entry_12mp</item>
-        <item>@string/pref_camera_picturesize_entry_8mp</item>
-        <item>@string/pref_camera_picturesize_entry_8mp</item>
-        <item>@string/pref_camera_picturesize_entry_square</item>
         <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_4mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_3mp</item>
         <item>@string/pref_camera_picturesize_entry_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_1920x1080</item>
         <item>@string/pref_camera_picturesize_entry_2mp</item>
-        <item>@string/pref_camera_picturesize_entry_2mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_1_5mp</item>
         <item>@string/pref_camera_picturesize_entry_1_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_1280x768</item>
-        <item>@string/pref_camera_picturesize_entry_1280x720</item>
         <item>@string/pref_camera_picturesize_entry_1mp</item>
-        <item>@string/pref_camera_picturesize_entry_800x600</item>
-        <item>@string/pref_camera_picturesize_entry_800x480</item>
-        <item>960 x 720</item>
-        <item>720 x 480</item>
-        <item>@string/pref_camera_picturesize_entry_vga</item>
-        <item>@string/pref_camera_picturesize_entry_352x288</item>
-        <item>@string/pref_camera_picturesize_entry_qvga</item>
-        <item>@string/pref_camera_picturesize_entry_176x144</item>
     </string-array>
     <!-- When launching the camera app first time, we will set the picture
          size to the first one in the list that is also supported by the
          driver -->
     <string-array name="pref_camera_picturesize_entryvalues" translatable="false">
-        <item>5248x3936</item>
-        <item>4608x3456</item>
-        <item>4160x3120</item>
-        <item>4000x3000</item>
-        <item>3840x2160</item>
-        <item>3264x2448</item>
-        <item>2976x2976</item>
         <item>2592x1944</item>
-        <item>2592x1936</item>
-        <item>2560x1920</item>
-        <item>2688x1512</item>
         <item>2048x1536</item>
-        <item>2048x1520</item>
-        <item>1920x1080</item>
         <item>1600x1200</item>
-        <item>1920x1088</item>
-        <item>1440x1080</item>
         <item>1280x960</item>
-        <item>1280x768</item>
-        <item>1280x720</item>
         <item>1024x768</item>
-        <item>800x600</item>
-        <item>800x480</item>
-        <item>960x720</item>
-        <item>720x480</item>
-        <item>640x480</item>
-        <item>352x288</item>
-        <item>320x240</item>
-        <item>176x144</item>
     </string-array>
 
     <!-- Camera Preferences focus mode dialog box entries -->
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index ca6ddc2e8..24f67499c 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -180,24 +180,12 @@
 
     <!-- Camera Preferences JPEG quality dialog box entries -->
     <string-array name="pref_camera_jpegquality_entries" translatable="false">
-        <item>@string/pref_camera_jpegquality_entry_0</item>
-        <item>@string/pref_camera_jpegquality_entry_1</item>
-        <item>@string/pref_camera_jpegquality_entry_2</item>
-        <item>@string/pref_camera_jpegquality_entry_3</item>
-        <item>@string/pref_camera_jpegquality_entry_4</item>
-        <item>@string/pref_camera_jpegquality_entry_5</item>
         <item>@string/pref_camera_jpegquality_entry_superfine</item>
         <item>@string/pref_camera_jpegquality_entry_fine</item>
         <item>@string/pref_camera_jpegquality_entry_normal</item>
     </string-array>
 
     <string-array name="pref_camera_jpegquality_entryvalues" translatable="false">
-        <item>55</item>
-        <item>65</item>
-        <item>75</item>
-        <item>85</item>
-        <item>95</item>
-        <item>100</item>
         <item>superfine</item>
         <item>fine</item>
         <item>normal</item>
@@ -205,12 +193,6 @@
 
     <!-- Rough estimates of jpeg compression ratio corresponding to qualities defined above. -->
     <integer-array name="jpegquality_compression_ratio">
-        <item>48</item>
-        <item>38</item>
-        <item>31</item>
-        <item>20</item>
-        <item>11</item>
-        <item>6</item>
         <item>20</item>
         <item>31</item>
         <item>38</item>