From dec6820659d163d4a70ac90a023eaf4f1188a78e Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Wed, 8 May 2013 11:14:35 -0700
Subject: Fix second level menu

  Bug: 8857098

Added Countdown timer and picture size items

Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
---
 res/drawable-hdpi/ic_exposure_holo_light_large.png | Bin 1551 -> 0 bytes
 .../ic_exposure_holo_light_xlarge.png              | Bin 1551 -> 0 bytes
 .../ic_flash_auto_holo_light_large.png             | Bin 2959 -> 0 bytes
 .../ic_flash_auto_holo_light_xlarge.png            | Bin 2959 -> 0 bytes
 .../ic_flash_off_holo_light_large.png              | Bin 2592 -> 0 bytes
 .../ic_flash_off_holo_light_xlarge.png             | Bin 2592 -> 0 bytes
 res/drawable-hdpi/ic_flash_on_holo_light_large.png | Bin 1918 -> 0 bytes
 .../ic_flash_on_holo_light_xlarge.png              | Bin 1918 -> 0 bytes
 res/drawable-hdpi/ic_imagesize.png                 | Bin 0 -> 2035 bytes
 res/drawable-hdpi/ic_indicator_sce_hdr.png         | Bin 2133 -> 2167 bytes
 res/drawable-hdpi/ic_indicator_sce_off.png         | Bin 1415 -> 1372 bytes
 res/drawable-hdpi/ic_indicator_sce_on.png          | Bin 2565 -> 2656 bytes
 res/drawable-hdpi/ic_settings_holo_light_large.png | Bin 1328 -> 0 bytes
 .../ic_settings_holo_light_xlarge.png              | Bin 1328 -> 0 bytes
 res/drawable-hdpi/ic_timer.png                     | Bin 0 -> 3331 bytes
 .../ic_exposure_holo_light_xlarge.png              | Bin 1132 -> 0 bytes
 .../ic_flash_auto_holo_light_xlarge.png            | Bin 1838 -> 0 bytes
 .../ic_flash_off_holo_light_xlarge.png             | Bin 1876 -> 0 bytes
 .../ic_flash_on_holo_light_xlarge.png              | Bin 1304 -> 0 bytes
 res/drawable-mdpi/ic_imagesize.png                 | Bin 0 -> 1377 bytes
 res/drawable-mdpi/ic_indicator_sce_hdr.png         | Bin 1422 -> 1419 bytes
 res/drawable-mdpi/ic_indicator_sce_off.png         | Bin 965 -> 971 bytes
 res/drawable-mdpi/ic_indicator_sce_on.png          | Bin 1651 -> 1642 bytes
 .../ic_settings_holo_light_xlarge.png              | Bin 1459 -> 0 bytes
 res/drawable-mdpi/ic_timer.png                     | Bin 0 -> 2171 bytes
 .../ic_exposure_holo_light_xlarge.png              | Bin 2131 -> 0 bytes
 .../ic_flash_auto_holo_light_xlarge.png            | Bin 4090 -> 0 bytes
 .../ic_flash_off_holo_light_xlarge.png             | Bin 3683 -> 0 bytes
 .../ic_flash_on_holo_light_xlarge.png              | Bin 2537 -> 0 bytes
 res/drawable-xhdpi/ic_imagesize.png                | Bin 0 -> 2560 bytes
 res/drawable-xhdpi/ic_indicator_sce_hdr.png        | Bin 2903 -> 2941 bytes
 res/drawable-xhdpi/ic_indicator_sce_off.png        | Bin 1864 -> 1865 bytes
 res/drawable-xhdpi/ic_indicator_sce_on.png         | Bin 3586 -> 3688 bytes
 .../ic_settings_holo_light_xlarge.png              | Bin 2782 -> 0 bytes
 res/drawable-xhdpi/ic_timer.png                    | Bin 0 -> 4636 bytes
 res/layout/countdown_setting_popup.xml             | 101 +++++++++++++++++++++
 res/layout/timer_setting_popup.xml                 | 101 ---------------------
 res/values-large-hdpi/drawable.xml                 |   5 -
 res/values-sw600dp-hdpi/drawable.xml               |   5 -
 res/values-sw640dp/drawable.xml                    |   5 -
 res/values-xlarge/drawable.xml                     |   5 -
 41 files changed, 101 insertions(+), 121 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_exposure_holo_light_large.png
 delete mode 100644 res/drawable-hdpi/ic_exposure_holo_light_xlarge.png
 delete mode 100644 res/drawable-hdpi/ic_flash_auto_holo_light_large.png
 delete mode 100644 res/drawable-hdpi/ic_flash_auto_holo_light_xlarge.png
 delete mode 100644 res/drawable-hdpi/ic_flash_off_holo_light_large.png
 delete mode 100644 res/drawable-hdpi/ic_flash_off_holo_light_xlarge.png
 delete mode 100644 res/drawable-hdpi/ic_flash_on_holo_light_large.png
 delete mode 100644 res/drawable-hdpi/ic_flash_on_holo_light_xlarge.png
 create mode 100644 res/drawable-hdpi/ic_imagesize.png
 delete mode 100644 res/drawable-hdpi/ic_settings_holo_light_large.png
 delete mode 100644 res/drawable-hdpi/ic_settings_holo_light_xlarge.png
 create mode 100644 res/drawable-hdpi/ic_timer.png
 delete mode 100644 res/drawable-mdpi/ic_exposure_holo_light_xlarge.png
 delete mode 100644 res/drawable-mdpi/ic_flash_auto_holo_light_xlarge.png
 delete mode 100644 res/drawable-mdpi/ic_flash_off_holo_light_xlarge.png
 delete mode 100644 res/drawable-mdpi/ic_flash_on_holo_light_xlarge.png
 create mode 100644 res/drawable-mdpi/ic_imagesize.png
 delete mode 100644 res/drawable-mdpi/ic_settings_holo_light_xlarge.png
 create mode 100644 res/drawable-mdpi/ic_timer.png
 delete mode 100644 res/drawable-xhdpi/ic_exposure_holo_light_xlarge.png
 delete mode 100644 res/drawable-xhdpi/ic_flash_auto_holo_light_xlarge.png
 delete mode 100644 res/drawable-xhdpi/ic_flash_off_holo_light_xlarge.png
 delete mode 100644 res/drawable-xhdpi/ic_flash_on_holo_light_xlarge.png
 create mode 100644 res/drawable-xhdpi/ic_imagesize.png
 delete mode 100644 res/drawable-xhdpi/ic_settings_holo_light_xlarge.png
 create mode 100644 res/drawable-xhdpi/ic_timer.png
 create mode 100644 res/layout/countdown_setting_popup.xml
 delete mode 100644 res/layout/timer_setting_popup.xml

diff --git a/res/drawable-hdpi/ic_exposure_holo_light_large.png b/res/drawable-hdpi/ic_exposure_holo_light_large.png
deleted file mode 100644
index ee45cfce2..000000000
Binary files a/res/drawable-hdpi/ic_exposure_holo_light_large.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_exposure_holo_light_xlarge.png b/res/drawable-hdpi/ic_exposure_holo_light_xlarge.png
deleted file mode 100644
index ee45cfce2..000000000
Binary files a/res/drawable-hdpi/ic_exposure_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_flash_auto_holo_light_large.png b/res/drawable-hdpi/ic_flash_auto_holo_light_large.png
deleted file mode 100644
index 00caf1bc7..000000000
Binary files a/res/drawable-hdpi/ic_flash_auto_holo_light_large.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_flash_auto_holo_light_xlarge.png b/res/drawable-hdpi/ic_flash_auto_holo_light_xlarge.png
deleted file mode 100644
index 00caf1bc7..000000000
Binary files a/res/drawable-hdpi/ic_flash_auto_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_flash_off_holo_light_large.png b/res/drawable-hdpi/ic_flash_off_holo_light_large.png
deleted file mode 100644
index 353df48ee..000000000
Binary files a/res/drawable-hdpi/ic_flash_off_holo_light_large.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_flash_off_holo_light_xlarge.png b/res/drawable-hdpi/ic_flash_off_holo_light_xlarge.png
deleted file mode 100644
index 353df48ee..000000000
Binary files a/res/drawable-hdpi/ic_flash_off_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_flash_on_holo_light_large.png b/res/drawable-hdpi/ic_flash_on_holo_light_large.png
deleted file mode 100644
index b508318e7..000000000
Binary files a/res/drawable-hdpi/ic_flash_on_holo_light_large.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_flash_on_holo_light_xlarge.png b/res/drawable-hdpi/ic_flash_on_holo_light_xlarge.png
deleted file mode 100644
index b508318e7..000000000
Binary files a/res/drawable-hdpi/ic_flash_on_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_imagesize.png b/res/drawable-hdpi/ic_imagesize.png
new file mode 100644
index 000000000..126208b44
Binary files /dev/null and b/res/drawable-hdpi/ic_imagesize.png differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_hdr.png b/res/drawable-hdpi/ic_indicator_sce_hdr.png
index de09fe158..0b8fdfa13 100644
Binary files a/res/drawable-hdpi/ic_indicator_sce_hdr.png and b/res/drawable-hdpi/ic_indicator_sce_hdr.png differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_off.png b/res/drawable-hdpi/ic_indicator_sce_off.png
index 076d82303..09bd2c893 100644
Binary files a/res/drawable-hdpi/ic_indicator_sce_off.png and b/res/drawable-hdpi/ic_indicator_sce_off.png differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_on.png b/res/drawable-hdpi/ic_indicator_sce_on.png
index 9ce466b81..ef0f56faf 100644
Binary files a/res/drawable-hdpi/ic_indicator_sce_on.png and b/res/drawable-hdpi/ic_indicator_sce_on.png differ
diff --git a/res/drawable-hdpi/ic_settings_holo_light_large.png b/res/drawable-hdpi/ic_settings_holo_light_large.png
deleted file mode 100644
index 13c99911d..000000000
Binary files a/res/drawable-hdpi/ic_settings_holo_light_large.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_settings_holo_light_xlarge.png b/res/drawable-hdpi/ic_settings_holo_light_xlarge.png
deleted file mode 100644
index 13c99911d..000000000
Binary files a/res/drawable-hdpi/ic_settings_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_timer.png b/res/drawable-hdpi/ic_timer.png
new file mode 100644
index 000000000..a3cec8d4c
Binary files /dev/null and b/res/drawable-hdpi/ic_timer.png differ
diff --git a/res/drawable-mdpi/ic_exposure_holo_light_xlarge.png b/res/drawable-mdpi/ic_exposure_holo_light_xlarge.png
deleted file mode 100644
index 4f4cc740a..000000000
Binary files a/res/drawable-mdpi/ic_exposure_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_flash_auto_holo_light_xlarge.png b/res/drawable-mdpi/ic_flash_auto_holo_light_xlarge.png
deleted file mode 100644
index 7dacd2058..000000000
Binary files a/res/drawable-mdpi/ic_flash_auto_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_flash_off_holo_light_xlarge.png b/res/drawable-mdpi/ic_flash_off_holo_light_xlarge.png
deleted file mode 100644
index 30b51a5b0..000000000
Binary files a/res/drawable-mdpi/ic_flash_off_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_flash_on_holo_light_xlarge.png b/res/drawable-mdpi/ic_flash_on_holo_light_xlarge.png
deleted file mode 100644
index 7bc69632c..000000000
Binary files a/res/drawable-mdpi/ic_flash_on_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_imagesize.png b/res/drawable-mdpi/ic_imagesize.png
new file mode 100644
index 000000000..d3f8b62fd
Binary files /dev/null and b/res/drawable-mdpi/ic_imagesize.png differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_hdr.png b/res/drawable-mdpi/ic_indicator_sce_hdr.png
index 06519411e..7907f647b 100644
Binary files a/res/drawable-mdpi/ic_indicator_sce_hdr.png and b/res/drawable-mdpi/ic_indicator_sce_hdr.png differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_off.png b/res/drawable-mdpi/ic_indicator_sce_off.png
index 52ad71394..4bfd91a97 100644
Binary files a/res/drawable-mdpi/ic_indicator_sce_off.png and b/res/drawable-mdpi/ic_indicator_sce_off.png differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_on.png b/res/drawable-mdpi/ic_indicator_sce_on.png
index 510c39f1f..6ea6d77c4 100644
Binary files a/res/drawable-mdpi/ic_indicator_sce_on.png and b/res/drawable-mdpi/ic_indicator_sce_on.png differ
diff --git a/res/drawable-mdpi/ic_settings_holo_light_xlarge.png b/res/drawable-mdpi/ic_settings_holo_light_xlarge.png
deleted file mode 100644
index 2b89fef8d..000000000
Binary files a/res/drawable-mdpi/ic_settings_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_timer.png b/res/drawable-mdpi/ic_timer.png
new file mode 100644
index 000000000..b55555ffc
Binary files /dev/null and b/res/drawable-mdpi/ic_timer.png differ
diff --git a/res/drawable-xhdpi/ic_exposure_holo_light_xlarge.png b/res/drawable-xhdpi/ic_exposure_holo_light_xlarge.png
deleted file mode 100644
index ed73752ad..000000000
Binary files a/res/drawable-xhdpi/ic_exposure_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_flash_auto_holo_light_xlarge.png b/res/drawable-xhdpi/ic_flash_auto_holo_light_xlarge.png
deleted file mode 100644
index 915f4a55f..000000000
Binary files a/res/drawable-xhdpi/ic_flash_auto_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_flash_off_holo_light_xlarge.png b/res/drawable-xhdpi/ic_flash_off_holo_light_xlarge.png
deleted file mode 100644
index f34e5a9b6..000000000
Binary files a/res/drawable-xhdpi/ic_flash_off_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_flash_on_holo_light_xlarge.png b/res/drawable-xhdpi/ic_flash_on_holo_light_xlarge.png
deleted file mode 100644
index b1dbbc07a..000000000
Binary files a/res/drawable-xhdpi/ic_flash_on_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_imagesize.png b/res/drawable-xhdpi/ic_imagesize.png
new file mode 100644
index 000000000..54fd00825
Binary files /dev/null and b/res/drawable-xhdpi/ic_imagesize.png differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_hdr.png b/res/drawable-xhdpi/ic_indicator_sce_hdr.png
index b60abb335..318c8fa6b 100644
Binary files a/res/drawable-xhdpi/ic_indicator_sce_hdr.png and b/res/drawable-xhdpi/ic_indicator_sce_hdr.png differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_off.png b/res/drawable-xhdpi/ic_indicator_sce_off.png
index aad8cf806..429d6ec79 100644
Binary files a/res/drawable-xhdpi/ic_indicator_sce_off.png and b/res/drawable-xhdpi/ic_indicator_sce_off.png differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_on.png b/res/drawable-xhdpi/ic_indicator_sce_on.png
index 39cfa4b52..8b2440c57 100644
Binary files a/res/drawable-xhdpi/ic_indicator_sce_on.png and b/res/drawable-xhdpi/ic_indicator_sce_on.png differ
diff --git a/res/drawable-xhdpi/ic_settings_holo_light_xlarge.png b/res/drawable-xhdpi/ic_settings_holo_light_xlarge.png
deleted file mode 100644
index 9fa8f7292..000000000
Binary files a/res/drawable-xhdpi/ic_settings_holo_light_xlarge.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_timer.png b/res/drawable-xhdpi/ic_timer.png
new file mode 100644
index 000000000..1764fddc8
Binary files /dev/null and b/res/drawable-xhdpi/ic_timer.png differ
diff --git a/res/layout/countdown_setting_popup.xml b/res/layout/countdown_setting_popup.xml
new file mode 100644
index 000000000..22acd9251
--- /dev/null
+++ b/res/layout/countdown_setting_popup.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013, The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.camera.ui.CountdownTimerPopup xmlns:android="http://schemas.android.com/apk/res/android"
+        style="@style/SettingPopupWindow">
+
+    <LinearLayout android:orientation="vertical"
+            android:background="@color/popup_background"
+            android:layout_height="wrap_content"
+            android:layout_width="@dimen/big_setting_popup_window_width">
+
+    <TextView
+            android:id="@+id/title"
+            style="@style/PopupTitleText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center_vertical|center_horizontal"
+            android:minHeight="@dimen/popup_title_frame_min_height" />
+
+    <View style="@style/PopupTitleSeparator" />
+
+    <LinearLayout
+            android:id="@+id/time_duration_picker"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/set_time_interval_title"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:paddingTop="5dip"
+                android:text="@string/set_duration"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+            <!-- A number picker to set timer -->
+
+            <NumberPicker
+                android:id="@+id/duration"
+                android:layout_width="160dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginLeft="16dip"
+                android:layout_marginRight="16dip"
+                android:focusable="false" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <View
+                android:background="#40ffffff"
+                android:layout_width="match_parent"
+                android:layout_height="1dip" />
+            <LinearLayout
+                android:id="@+id/timer_sound"
+                style="@style/SettingRow" >
+
+                <TextView android:id="@+id/beep_title"
+                    style="@style/SettingItemTitle"
+                    android:text="@string/pref_camera_timer_sound_title" />
+
+                <CheckBox android:id="@+id/sound_check_box"
+                    android:layout_gravity="center_vertical|right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent" />
+            </LinearLayout>
+
+            <View
+                android:background="#40ffffff"
+                android:layout_width="match_parent"
+                android:layout_height="1dip" />
+
+            <Button
+                android:id="@+id/timer_set_button"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/time_lapse_interval_set"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+        </LinearLayout>
+    </LinearLayout>
+</com.android.camera.ui.CountdownTimerPopup>
diff --git a/res/layout/timer_setting_popup.xml b/res/layout/timer_setting_popup.xml
deleted file mode 100644
index d6e8000ee..000000000
--- a/res/layout/timer_setting_popup.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013, The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.camera.ui.TimerSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/SettingPopupWindow">
-
-    <LinearLayout android:orientation="vertical"
-            android:background="@color/popup_background"
-            android:layout_height="wrap_content"
-            android:layout_width="@dimen/big_setting_popup_window_width">
-
-        <LinearLayout android:orientation="horizontal"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent">
-            <TextView
-                    android:id="@+id/title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:layout_weight="1"
-                    android:minHeight="@dimen/popup_title_frame_min_height"
-                    android:gravity="center_vertical"
-                    style="@style/PopupTitleText" />
-            <Switch
-                    android:id="@+id/timer_setting_switch"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0"
-                    android:layout_marginRight="8dp"
-                    android:layout_gravity="right|center_vertical" />
-        </LinearLayout>
-
-        <View style="@style/PopupTitleSeparator" />
-
-        <TextView
-                android:id="@+id/set_timer_help_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingTop="16dip"
-                android:paddingLeft="16dip"
-                android:paddingRight="16dip"
-                android:paddingBottom="16dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/set_timer_help"/>
-
-        <LinearLayout
-                android:id="@+id/time_duration_picker"
-                android:orientation="vertical"
-                android:layout_gravity="center_horizontal"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent">
-            <TextView
-                    android:id="@+id/set_time_interval_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:paddingTop="5dip"
-                    android:gravity="center"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:text="@string/set_duration"/>
-            <!-- A number picker to set timer -->
-            <NumberPicker
-                    android:id="@+id/duration"
-                    android:layout_width="160dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginRight="16dip"
-                    android:layout_gravity="center_horizontal"
-                    android:focusable="false" />
-        </LinearLayout>
-
-        <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:divider="?android:attr/dividerHorizontal"
-                android:showDividers="beginning"
-                android:dividerPadding="0dip">
-            <Button android:id="@+id/timer_set_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    style="?android:attr/buttonBarButtonStyle"
-                    android:text="@string/time_lapse_interval_set" />
-        </LinearLayout>
-    </LinearLayout>
-
-</com.android.camera.ui.TimerSettingPopup>
diff --git a/res/values-large-hdpi/drawable.xml b/res/values-large-hdpi/drawable.xml
index 119ab1de8..b810347b4 100644
--- a/res/values-large-hdpi/drawable.xml
+++ b/res/values-large-hdpi/drawable.xml
@@ -17,10 +17,6 @@
     <item name="btn_video_shutter_recording_holo" type="drawable">@drawable/btn_video_shutter_recording_holo_large</item>
     <item name="btn_video_shutter_recording_pressed_holo" type="drawable">@drawable/btn_video_shutter_recording_pressed_holo_large</item>
     <item name="ic_effects_holo_light" type="drawable">@drawable/ic_effects_holo_light_large</item>
-    <item name="ic_exposure_holo_light" type="drawable">@drawable/ic_exposure_holo_light_large</item>
-    <item name="ic_flash_auto_holo_light" type="drawable">@drawable/ic_flash_auto_holo_light_large</item>
-    <item name="ic_flash_off_holo_light" type="drawable">@drawable/ic_flash_off_holo_light_large</item>
-    <item name="ic_flash_on_holo_light" type="drawable">@drawable/ic_flash_on_holo_light_large</item>
     <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_large</item>
     <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_large</item>
     <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_large</item>
@@ -28,7 +24,6 @@
     <item name="ic_pan_right_indicator_fast" type="drawable">@drawable/ic_pan_right_indicator_fast_large</item>
     <item name="ic_pan_right_indicator" type="drawable">@drawable/ic_pan_right_indicator_large</item>
     <item name="ic_scn_holo_light" type="drawable">@drawable/ic_scn_holo_light_large</item>
-    <item name="ic_settings_holo_light" type="drawable">@drawable/ic_settings_holo_light_large</item>
     <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>
diff --git a/res/values-sw600dp-hdpi/drawable.xml b/res/values-sw600dp-hdpi/drawable.xml
index 119ab1de8..b810347b4 100644
--- a/res/values-sw600dp-hdpi/drawable.xml
+++ b/res/values-sw600dp-hdpi/drawable.xml
@@ -17,10 +17,6 @@
     <item name="btn_video_shutter_recording_holo" type="drawable">@drawable/btn_video_shutter_recording_holo_large</item>
     <item name="btn_video_shutter_recording_pressed_holo" type="drawable">@drawable/btn_video_shutter_recording_pressed_holo_large</item>
     <item name="ic_effects_holo_light" type="drawable">@drawable/ic_effects_holo_light_large</item>
-    <item name="ic_exposure_holo_light" type="drawable">@drawable/ic_exposure_holo_light_large</item>
-    <item name="ic_flash_auto_holo_light" type="drawable">@drawable/ic_flash_auto_holo_light_large</item>
-    <item name="ic_flash_off_holo_light" type="drawable">@drawable/ic_flash_off_holo_light_large</item>
-    <item name="ic_flash_on_holo_light" type="drawable">@drawable/ic_flash_on_holo_light_large</item>
     <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_large</item>
     <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_large</item>
     <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_large</item>
@@ -28,7 +24,6 @@
     <item name="ic_pan_right_indicator_fast" type="drawable">@drawable/ic_pan_right_indicator_fast_large</item>
     <item name="ic_pan_right_indicator" type="drawable">@drawable/ic_pan_right_indicator_large</item>
     <item name="ic_scn_holo_light" type="drawable">@drawable/ic_scn_holo_light_large</item>
-    <item name="ic_settings_holo_light" type="drawable">@drawable/ic_settings_holo_light_large</item>
     <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>
diff --git a/res/values-sw640dp/drawable.xml b/res/values-sw640dp/drawable.xml
index 77d453c4d..6a6e71192 100644
--- a/res/values-sw640dp/drawable.xml
+++ b/res/values-sw640dp/drawable.xml
@@ -17,10 +17,6 @@
     <item name="btn_video_shutter_recording_holo" type="drawable">@drawable/btn_video_shutter_recording_holo_xlarge</item>
     <item name="btn_video_shutter_recording_pressed_holo" type="drawable">@drawable/btn_video_shutter_recording_pressed_holo_xlarge</item>
     <item name="ic_effects_holo_light" type="drawable">@drawable/ic_effects_holo_light_xlarge</item>
-    <item name="ic_exposure_holo_light" type="drawable">@drawable/ic_exposure_holo_light_xlarge</item>
-    <item name="ic_flash_auto_holo_light" type="drawable">@drawable/ic_flash_auto_holo_light_xlarge</item>
-    <item name="ic_flash_off_holo_light" type="drawable">@drawable/ic_flash_off_holo_light_xlarge</item>
-    <item name="ic_flash_on_holo_light" type="drawable">@drawable/ic_flash_on_holo_light_xlarge</item>
     <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_xlarge</item>
     <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_xlarge</item>
     <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_xlarge</item>
@@ -28,7 +24,6 @@
     <item name="ic_pan_right_indicator_fast" type="drawable">@drawable/ic_pan_right_indicator_fast_xlarge</item>
     <item name="ic_pan_right_indicator" type="drawable">@drawable/ic_pan_right_indicator_xlarge</item>
     <item name="ic_scn_holo_light" type="drawable">@drawable/ic_scn_holo_light_xlarge</item>
-    <item name="ic_settings_holo_light" type="drawable">@drawable/ic_settings_holo_light_xlarge</item>
     <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>
diff --git a/res/values-xlarge/drawable.xml b/res/values-xlarge/drawable.xml
index 48436c052..648f1d7fd 100644
--- a/res/values-xlarge/drawable.xml
+++ b/res/values-xlarge/drawable.xml
@@ -15,10 +15,6 @@
 -->
 <resources>
     <item name="ic_effects_holo_light" type="drawable">@drawable/ic_effects_holo_light_xlarge</item>
-    <item name="ic_exposure_holo_light" type="drawable">@drawable/ic_exposure_holo_light_xlarge</item>
-    <item name="ic_flash_auto_holo_light" type="drawable">@drawable/ic_flash_auto_holo_light_xlarge</item>
-    <item name="ic_flash_off_holo_light" type="drawable">@drawable/ic_flash_off_holo_light_xlarge</item>
-    <item name="ic_flash_on_holo_light" type="drawable">@drawable/ic_flash_on_holo_light_xlarge</item>
     <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_xlarge</item>
     <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_xlarge</item>
     <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_xlarge</item>
@@ -26,7 +22,6 @@
     <item name="ic_pan_right_indicator_fast" type="drawable">@drawable/ic_pan_right_indicator_fast_xlarge</item>
     <item name="ic_pan_right_indicator" type="drawable">@drawable/ic_pan_right_indicator_xlarge</item>
     <item name="ic_scn_holo_light" type="drawable">@drawable/ic_scn_holo_light_xlarge</item>
-    <item name="ic_settings_holo_light" type="drawable">@drawable/ic_settings_holo_light_xlarge</item>
     <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>
-- 
cgit v1.2.3