OSDN Git Service

Merge "Suppress capture indicator while recording video." into ub-camera-haleakala
[android-x86/packages-apps-Camera2.git] / res / values / arrays.xml
index bb11150..37a5c7e 100644 (file)
    </string-array>
 
     <string-array name="pref_video_quality_entryvalues" translatable="false">
-        <!-- Large size is the default. -->
-        <item>@string/pref_video_quality_default</item>
-        <!-- A medium size -->
-        <item>medium</item>
-        <!-- Small size. -->
-        <item>small</item>
-    </string-array>
-
-    <!-- These values correspond to the time interval between frame capture in millseconds
-    for time lapse recording -->
-    <string-array name="pref_video_time_lapse_frame_interval_entryvalues" translatable="false">
-        <item>0</item>
-        <item>500</item>
-        <item>1000</item>
-        <item>1500</item>
-        <item>2000</item>
-        <item>2500</item>
-        <item>3000</item>
-        <item>4000</item>
-        <item>5000</item>
-        <item>6000</item>
-        <item>10000</item>
-        <item>12000</item>
-        <item>15000</item>
-        <item>24000</item>
-        <item>30000</item>
-        <item>60000</item>
-        <item>90000</item>
-        <item>120000</item>
-        <item>150000</item>
-        <item>180000</item>
-        <item>240000</item>
-        <item>300000</item>
-        <item>360000</item>
-        <item>600000</item>
-        <item>720000</item>
-        <item>900000</item>
-        <item>1440000</item>
-        <item>1800000</item>
-        <item>3600000</item>
-        <item>5400000</item>
-        <item>7200000</item>
-        <item>9000000</item>
-        <item>10800000</item>
-        <item>14400000</item>
-        <item>18000000</item>
-        <item>21600000</item>
-        <item>36000000</item>
-        <item>43200000</item>
-        <item>54000000</item>
-        <item>86400000</item>
-    </string-array>
-
-    <!-- These values correspond to the time interval between frame capture in
-    different units (i.e. seconds, minutes, hours) for time lapse recording -->
-    <string-array name="pref_video_time_lapse_frame_interval_entries">
-        <item>@string/pref_video_time_lapse_frame_interval_off</item>
-        <item>@string/pref_video_time_lapse_frame_interval_500</item>
-        <item>@string/pref_video_time_lapse_frame_interval_1000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_1500</item>
-        <item>@string/pref_video_time_lapse_frame_interval_2000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_2500</item>
-        <item>@string/pref_video_time_lapse_frame_interval_3000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_4000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_5000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_6000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_10000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_12000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_15000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_24000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_30000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_60000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_90000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_120000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_150000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_180000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_240000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_300000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_360000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_600000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_720000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_900000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_1440000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_1800000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_3600000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_5400000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_7200000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_9000000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_10800000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_14400000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_18000000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_21600000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_36000000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_43200000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_54000000</item>
-        <item>@string/pref_video_time_lapse_frame_interval_86400000</item>
-    </string-array>
-
-    <!-- These values correspond to the time interval between frame capture
-    for time lapse recording -->
-    <string-array name="pref_video_time_lapse_frame_interval_duration_values" translatable="false">
-        <item>0.5</item>
-        <item>1</item>
-        <item>1.5</item>
-        <item>2</item>
-        <item>2.5</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>10</item>
-        <item>12</item>
-        <item>15</item>
-        <item>24</item>
-    </string-array>
-
-    <string-array name="pref_video_time_lapse_frame_interval_units">
-        <item>@string/time_lapse_seconds</item>
-        <item>@string/time_lapse_minutes</item>
-        <item>@string/time_lapse_hours</item>
+        <item>@string/pref_video_quality_large</item>
+        <item>@string/pref_video_quality_medium</item>
+        <item>@string/pref_video_quality_small</item>
     </string-array>
 
     <!-- Camera Preferences Picture size dialog box entries -->
     <integer name="camera_mode_refocus">2</integer>
     <integer name="camera_mode_photosphere">3</integer>
     <integer name="camera_mode_panorama">4</integer>
-    <integer name="camera_mode_timelapse">5</integer>
-    <integer name="camera_mode_gcam">6</integer>
+    <integer name="camera_mode_gcam">5</integer>
+
 
     <!-- Ordered list of all camera modes. -->
     <integer-array name="camera_modes">
         <item>@integer/camera_mode_refocus</item>
         <item>@integer/camera_mode_photosphere</item>
         <item>@integer/camera_mode_panorama</item>
-        <item>@integer/camera_mode_timelapse</item>
         <item>@integer/camera_mode_gcam</item>
     </integer-array>
 
         <item>@integer/camera_mode_photosphere</item>
         <item>@integer/camera_mode_panorama</item>
         <item>@integer/camera_mode_photo</item>
-        <item>@integer/camera_mode_photo</item>
     </integer-array>
 
     <!-- An array of camera mode indices that should always be visible in mode drawer. -->
     <array name="camera_mode_theme_color">
         <item>@color/camera_mode_color</item>
         <item>@color/video_mode_color</item>
-        <item>@color/craft_mode_color</item>
+        <item>@color/refocus_mode_color</item>
         <item>@color/photosphere_mode_color</item>
         <item>@color/panorama_mode_color</item>
-        <item>@color/timelapse_mode_color</item>
         <item>@color/camera_mode_color</item>
     </array>
 
         <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>
         <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_timelapse_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>@null</item>
-        <item>@drawable/ic_panorama</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_camera</item>
+        <item>@drawable/ic_capture_panorama</item>
+        <item>@drawable/ic_capture_camera</item>
     </array>
 
     <!-- These must correspond in order to the entries in CameraProfile. -->
         <item>@string/pref_video_quality_entry_720p_notrans</item>
         <item>@string/pref_video_quality_entry_1080p_notrans</item>
         <item>@string/pref_video_quality_entry_qvga_notrans</item>
+        <item>@string/pref_video_quality_entry_2160p_notrans</item>
     </array>
 
     <array name="pref_default_boolean_entryvalues">
         <item>@string/pref_boolean_false</item>
         <item>@string/pref_boolean_true</item>
     </array>
+
+    <array name="shutter_button_backgrounds" translatable="false">
+        <item>@drawable/shutter_button_background_still</item>
+        <item>@drawable/shutter_button_background_video</item>
+        <item>@drawable/shutter_button_background_refocus</item>
+        <item>@drawable/shutter_button_background_still</item>
+        <item>@drawable/shutter_button_background_still</item>
+        <item>@drawable/shutter_button_background_still</item>
+    </array>
 </resources>