Shorten location startup dialog string

[android-x86/packages-apps-Camera2.git] / res / values / arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a8cda78..4872657 100644 (file)
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -83,6 +83,12 @@
         <item>on</item>
     </string-array>
 
+    <string-array name="pref_camera_hdr_supportmode_entryvalues" translatable="false">
+        <item>@string/pref_camera_hdr_supportmode_none</item>
+        <item>@string/pref_camera_hdr_supportmode_hdr</item>
+        <item>@string/pref_camera_hdr_supportmode_hdr_plus</item>
+    </string-array>
+
     <string-array name="pref_camera_hdr_plus_flashmode_entryvalues" translatable="false">
         <item>off</item>
         <item>auto</item>
@@ -401,6 +407,7 @@
     <integer name="camera_mode_photosphere">3</integer>
     <integer name="camera_mode_panorama">4</integer>
     <integer name="camera_mode_gcam">5</integer>
+    <integer name="camera_mode_capture_intent">6</integer>
 
 
     <!-- Ordered list of all camera modes. -->
@@ -411,6 +418,7 @@
         <item>@integer/camera_mode_photosphere</item>
         <item>@integer/camera_mode_panorama</item>
         <item>@integer/camera_mode_gcam</item>
+        <item>@integer/camera_mode_capture_intent</item>
     </integer-array>
 
     <!-- An array of camera mode indices in the sequence of their appearance
@@ -445,6 +453,7 @@
         <item>@color/photosphere_mode_color</item>
         <item>@color/panorama_mode_color</item>
         <item>@color/camera_mode_color</item>
+        <item>@color/camera_mode_color</item>
     </array>
 
     <string-array name="camera_mode_text">
@@ -471,7 +480,7 @@
         <item>@drawable/ic_camera_blanket</item>
         <item>@drawable/ic_video_blanket</item>
         <item>@drawable/ic_refocus_blanket</item>
-        <item>@drawable/ic_photo_sphere_blanket</item>
+        <item>@drawable/ic_photosphere_blanket</item>
         <item>@drawable/ic_pano_blanket</item>
         <item>@drawable/ic_camera_blanket</item>
         <item>@drawable/ic_camera_blanket</item>
@@ -481,18 +490,20 @@
         <item>@drawable/ic_camera_normal</item>
         <item>@drawable/ic_video_normal</item>
         <item>@drawable/ic_refocus_normal</item>
-        <item>@drawable/ic_photo_sphere_normal</item>
+        <item>@drawable/ic_photosphere_normal</item>
         <item>@drawable/ic_panorama_normal</item>
         <item>@drawable/ic_camera_normal</item>
+        <item>@drawable/ic_camera_normal</item>
     </array>
 
     <array name="camera_mode_shutter_icon">
-        <item>@drawable/ic_camera</item>
-        <item>@drawable/ic_video</item>
-        <item>@drawable/ic_refocus</item>
+        <item>@drawable/ic_capture_camera</item>
+        <item>@drawable/ic_capture_video</item>
+        <item>@drawable/ic_capture_refocus</item>
         <item>@null</item>
-        <item>@drawable/ic_panorama</item>
-        <item>@drawable/ic_camera</item>
+        <item>@drawable/ic_capture_panorama</item>
+        <item>@drawable/ic_capture_camera</item>
+        <item>@drawable/ic_capture_camera</item>
     </array>
 
     <!-- These must correspond in order to the entries in CameraProfile. -->
@@ -520,5 +531,6 @@
         <item>@drawable/shutter_button_background_still</item>
         <item>@drawable/shutter_button_background_still</item>
         <item>@drawable/shutter_button_background_still</item>
+        <item>@drawable/shutter_button_background_still</item>
     </array>
 </resources>