Merge "clean out timelapse stuff from codebase" into ub-camera-glacier

16 files changed, 0 insertions, 118 deletions

diff --git a/res/drawable-hdpi/ic_timelapse_none.png b/res/drawable-hdpi/ic_timelapse_none.png
deleted file mode 100644
index 6283f57f4..000000000
--- a/res/drawable-hdpi/ic_timelapse_none.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_timelapse_none_large.png b/res/drawable-hdpi/ic_timelapse_none_large.png
deleted file mode 100644
index 33e462f7b..000000000
--- a/res/drawable-hdpi/ic_timelapse_none_large.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_timelapse_none_xlarge.png b/res/drawable-hdpi/ic_timelapse_none_xlarge.png
deleted file mode 100644
index 33e462f7b..000000000
--- a/res/drawable-hdpi/ic_timelapse_none_xlarge.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_timelapse_normal.png b/res/drawable-hdpi/ic_timelapse_normal.png
deleted file mode 100644
index 6303033dd..000000000
--- a/res/drawable-hdpi/ic_timelapse_normal.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_timelapse_none.png b/res/drawable-mdpi/ic_timelapse_none.png
deleted file mode 100644
index 122e6faec..000000000
--- a/res/drawable-mdpi/ic_timelapse_none.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_timelapse_none_xlarge.png b/res/drawable-mdpi/ic_timelapse_none_xlarge.png
deleted file mode 100644
index 67e36a69b..000000000
--- a/res/drawable-mdpi/ic_timelapse_none_xlarge.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_timelapse_normal.png b/res/drawable-mdpi/ic_timelapse_normal.png
deleted file mode 100644
index 44b02c2cf..000000000
--- a/res/drawable-mdpi/ic_timelapse_normal.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_timelapse_none.png b/res/drawable-xhdpi/ic_timelapse_none.png
deleted file mode 100644
index 265f59b51..000000000
--- a/res/drawable-xhdpi/ic_timelapse_none.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_timelapse_none_xlarge.png b/res/drawable-xhdpi/ic_timelapse_none_xlarge.png
deleted file mode 100644
index ace6b3666..000000000
--- a/res/drawable-xhdpi/ic_timelapse_none_xlarge.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_timelapse_normal.png b/res/drawable-xhdpi/ic_timelapse_normal.png
deleted file mode 100644
index f9a160420..000000000
--- a/res/drawable-xhdpi/ic_timelapse_normal.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_timelapse_normal.png b/res/drawable-xxhdpi/ic_timelapse_normal.png
deleted file mode 100644
index aaade0436..000000000
--- a/res/drawable-xxhdpi/ic_timelapse_normal.png
+++ /dev/null
diff --git a/res/values-large-hdpi/drawable.xml b/res/values-large-hdpi/drawable.xml
index b810347b4..38b4a9086 100644
--- a/res/values-large-hdpi/drawable.xml
+++ b/res/values-large-hdpi/drawable.xml
@@ -27,6 +27,5 @@
     <item name="ic_snapshot_border" type="drawable">@drawable/ic_snapshot_border_large</item>
     <item name="ic_switch_photo_facing_holo_light" type="drawable">@drawable/ic_switch_photo_facing_holo_light_large</item>
     <item name="ic_switch_video_facing_holo_light" type="drawable">@drawable/ic_switch_video_facing_holo_light_large</item>
-    <item name="ic_timelapse_none" type="drawable">@drawable/ic_timelapse_none_large</item>
     <item name="list_divider" type="drawable">@drawable/list_divider_large</item>
 </resources>
diff --git a/res/values-sw600dp-hdpi/drawable.xml b/res/values-sw600dp-hdpi/drawable.xml
index b810347b4..38b4a9086 100644
--- a/res/values-sw600dp-hdpi/drawable.xml
+++ b/res/values-sw600dp-hdpi/drawable.xml
@@ -27,6 +27,5 @@
     <item name="ic_snapshot_border" type="drawable">@drawable/ic_snapshot_border_large</item>
     <item name="ic_switch_photo_facing_holo_light" type="drawable">@drawable/ic_switch_photo_facing_holo_light_large</item>
     <item name="ic_switch_video_facing_holo_light" type="drawable">@drawable/ic_switch_video_facing_holo_light_large</item>
-    <item name="ic_timelapse_none" type="drawable">@drawable/ic_timelapse_none_large</item>
     <item name="list_divider" type="drawable">@drawable/list_divider_large</item>
 </resources>
diff --git a/res/values-sw640dp/drawable.xml b/res/values-sw640dp/drawable.xml
index 6a6e71192..33026fe9c 100644
--- a/res/values-sw640dp/drawable.xml
+++ b/res/values-sw640dp/drawable.xml
@@ -27,5 +27,4 @@
     <item name="ic_snapshot_border" type="drawable">@drawable/ic_snapshot_border_xlarge</item>
     <item name="ic_switch_photo_facing_holo_light" type="drawable">@drawable/ic_switch_photo_facing_holo_light_xlarge</item>
     <item name="ic_switch_video_facing_holo_light" type="drawable">@drawable/ic_switch_video_facing_holo_light_xlarge</item>
-    <item name="ic_timelapse_none" type="drawable">@drawable/ic_timelapse_none_xlarge</item>
 </resources>
diff --git a/res/values-xlarge/drawable.xml b/res/values-xlarge/drawable.xml
index 648f1d7fd..43e57218d 100644
--- a/res/values-xlarge/drawable.xml
+++ b/res/values-xlarge/drawable.xml
@@ -25,5 +25,4 @@
     <item name="ic_snapshot_border" type="drawable">@drawable/ic_snapshot_border_xlarge</item>
     <item name="ic_switch_photo_facing_holo_light" type="drawable">@drawable/ic_switch_photo_facing_holo_light_xlarge</item>
     <item name="ic_switch_video_facing_holo_light" type="drawable">@drawable/ic_switch_video_facing_holo_light_xlarge</item>
-    <item name="ic_timelapse_none" type="drawable">@drawable/ic_timelapse_none_xlarge</item>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 5711f054d..db2565cf5 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -32,120 +32,6 @@
         <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>
-    </string-array>
-
     <!-- Camera Preferences Picture size dialog box entries -->
     <string-array name="pref_camera_picturesize_entries" translatable="false">
         <item>@string/pref_camera_picturesize_entry_large</item>