summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-05-08 11:14:35 -0700
committerMichael Kolb <kolby@google.com>2013-05-08 14:17:25 -0700
commitdec6820659d163d4a70ac90a023eaf4f1188a78e (patch)
tree97649cc72e2a800cac2e8c64210b61b961745c89
parent7d651067391ffff56d4a8726cd9f297f2738de1d (diff)
downloadandroid_packages_apps_Snap-dec6820659d163d4a70ac90a023eaf4f1188a78e.zip
android_packages_apps_Snap-dec6820659d163d4a70ac90a023eaf4f1188a78e.tar.gz
android_packages_apps_Snap-dec6820659d163d4a70ac90a023eaf4f1188a78e.tar.bz2
Fix second level menu
Bug: 8857098 Added Countdown timer and picture size items Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
-rw-r--r--res/drawable-hdpi/ic_exposure_holo_light_large.pngbin1551 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_exposure_holo_light_xlarge.pngbin1551 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_auto_holo_light_large.pngbin2959 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_auto_holo_light_xlarge.pngbin2959 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_off_holo_light_large.pngbin2592 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_off_holo_light_xlarge.pngbin2592 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_on_holo_light_large.pngbin1918 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_on_holo_light_xlarge.pngbin1918 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_imagesize.pngbin0 -> 2035 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_sce_hdr.pngbin2133 -> 2167 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_sce_off.pngbin1415 -> 1372 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_sce_on.pngbin2565 -> 2656 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_holo_light_large.pngbin1328 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_holo_light_xlarge.pngbin1328 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_timer.pngbin0 -> 3331 bytes
-rw-r--r--res/drawable-mdpi/ic_exposure_holo_light_xlarge.pngbin1132 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_auto_holo_light_xlarge.pngbin1838 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_off_holo_light_xlarge.pngbin1876 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_on_holo_light_xlarge.pngbin1304 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_imagesize.pngbin0 -> 1377 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_sce_hdr.pngbin1422 -> 1419 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_sce_off.pngbin965 -> 971 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_sce_on.pngbin1651 -> 1642 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_holo_light_xlarge.pngbin1459 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_timer.pngbin0 -> 2171 bytes
-rw-r--r--res/drawable-xhdpi/ic_exposure_holo_light_xlarge.pngbin2131 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_auto_holo_light_xlarge.pngbin4090 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_off_holo_light_xlarge.pngbin3683 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_on_holo_light_xlarge.pngbin2537 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_imagesize.pngbin0 -> 2560 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_sce_hdr.pngbin2903 -> 2941 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_sce_off.pngbin1864 -> 1865 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_sce_on.pngbin3586 -> 3688 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_holo_light_xlarge.pngbin2782 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_timer.pngbin0 -> 4636 bytes
-rw-r--r--res/layout/countdown_setting_popup.xml101
-rw-r--r--res/layout/timer_setting_popup.xml101
-rw-r--r--res/values-large-hdpi/drawable.xml5
-rw-r--r--res/values-sw600dp-hdpi/drawable.xml5
-rw-r--r--res/values-sw640dp/drawable.xml5
-rw-r--r--res/values-xlarge/drawable.xml5
41 files changed, 101 insertions, 121 deletions
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 ee45cfc..0000000
--- a/res/drawable-hdpi/ic_exposure_holo_light_large.png
+++ /dev/null
Binary files 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 ee45cfc..0000000
--- a/res/drawable-hdpi/ic_exposure_holo_light_xlarge.png
+++ /dev/null
Binary files 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 00caf1b..0000000
--- a/res/drawable-hdpi/ic_flash_auto_holo_light_large.png
+++ /dev/null
Binary files 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 00caf1b..0000000
--- a/res/drawable-hdpi/ic_flash_auto_holo_light_xlarge.png
+++ /dev/null
Binary files 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 353df48..0000000
--- a/res/drawable-hdpi/ic_flash_off_holo_light_large.png
+++ /dev/null
Binary files 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 353df48..0000000
--- a/res/drawable-hdpi/ic_flash_off_holo_light_xlarge.png
+++ /dev/null
Binary files 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 b508318..0000000
--- a/res/drawable-hdpi/ic_flash_on_holo_light_large.png
+++ /dev/null
Binary files 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 b508318..0000000
--- a/res/drawable-hdpi/ic_flash_on_holo_light_xlarge.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_imagesize.png b/res/drawable-hdpi/ic_imagesize.png
new file mode 100644
index 0000000..126208b
--- /dev/null
+++ b/res/drawable-hdpi/ic_imagesize.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_hdr.png b/res/drawable-hdpi/ic_indicator_sce_hdr.png
index de09fe1..0b8fdfa 100644
--- a/res/drawable-hdpi/ic_indicator_sce_hdr.png
+++ b/res/drawable-hdpi/ic_indicator_sce_hdr.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_off.png b/res/drawable-hdpi/ic_indicator_sce_off.png
index 076d823..09bd2c8 100644
--- a/res/drawable-hdpi/ic_indicator_sce_off.png
+++ b/res/drawable-hdpi/ic_indicator_sce_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_on.png b/res/drawable-hdpi/ic_indicator_sce_on.png
index 9ce466b..ef0f56f 100644
--- a/res/drawable-hdpi/ic_indicator_sce_on.png
+++ b/res/drawable-hdpi/ic_indicator_sce_on.png
Binary files 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 13c9991..0000000
--- a/res/drawable-hdpi/ic_settings_holo_light_large.png
+++ /dev/null
Binary files 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 13c9991..0000000
--- a/res/drawable-hdpi/ic_settings_holo_light_xlarge.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer.png b/res/drawable-hdpi/ic_timer.png
new file mode 100644
index 0000000..a3cec8d
--- /dev/null
+++ b/res/drawable-hdpi/ic_timer.png
Binary files 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 4f4cc74..0000000
--- a/res/drawable-mdpi/ic_exposure_holo_light_xlarge.png
+++ /dev/null
Binary files 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 7dacd20..0000000
--- a/res/drawable-mdpi/ic_flash_auto_holo_light_xlarge.png
+++ /dev/null
Binary files 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 30b51a5..0000000
--- a/res/drawable-mdpi/ic_flash_off_holo_light_xlarge.png
+++ /dev/null
Binary files 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 7bc6963..0000000
--- a/res/drawable-mdpi/ic_flash_on_holo_light_xlarge.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_imagesize.png b/res/drawable-mdpi/ic_imagesize.png
new file mode 100644
index 0000000..d3f8b62
--- /dev/null
+++ b/res/drawable-mdpi/ic_imagesize.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_hdr.png b/res/drawable-mdpi/ic_indicator_sce_hdr.png
index 0651941..7907f64 100644
--- a/res/drawable-mdpi/ic_indicator_sce_hdr.png
+++ b/res/drawable-mdpi/ic_indicator_sce_hdr.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_off.png b/res/drawable-mdpi/ic_indicator_sce_off.png
index 52ad713..4bfd91a 100644
--- a/res/drawable-mdpi/ic_indicator_sce_off.png
+++ b/res/drawable-mdpi/ic_indicator_sce_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_on.png b/res/drawable-mdpi/ic_indicator_sce_on.png
index 510c39f..6ea6d77 100644
--- a/res/drawable-mdpi/ic_indicator_sce_on.png
+++ b/res/drawable-mdpi/ic_indicator_sce_on.png
Binary files 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 2b89fef..0000000
--- a/res/drawable-mdpi/ic_settings_holo_light_xlarge.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer.png b/res/drawable-mdpi/ic_timer.png
new file mode 100644
index 0000000..b55555f
--- /dev/null
+++ b/res/drawable-mdpi/ic_timer.png
Binary files 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 ed73752..0000000
--- a/res/drawable-xhdpi/ic_exposure_holo_light_xlarge.png
+++ /dev/null
Binary files 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 915f4a5..0000000
--- a/res/drawable-xhdpi/ic_flash_auto_holo_light_xlarge.png
+++ /dev/null
Binary files 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 f34e5a9..0000000
--- a/res/drawable-xhdpi/ic_flash_off_holo_light_xlarge.png
+++ /dev/null
Binary files 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 b1dbbc0..0000000
--- a/res/drawable-xhdpi/ic_flash_on_holo_light_xlarge.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_imagesize.png b/res/drawable-xhdpi/ic_imagesize.png
new file mode 100644
index 0000000..54fd008
--- /dev/null
+++ b/res/drawable-xhdpi/ic_imagesize.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_hdr.png b/res/drawable-xhdpi/ic_indicator_sce_hdr.png
index b60abb3..318c8fa 100644
--- a/res/drawable-xhdpi/ic_indicator_sce_hdr.png
+++ b/res/drawable-xhdpi/ic_indicator_sce_hdr.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_off.png b/res/drawable-xhdpi/ic_indicator_sce_off.png
index aad8cf8..429d6ec 100644
--- a/res/drawable-xhdpi/ic_indicator_sce_off.png
+++ b/res/drawable-xhdpi/ic_indicator_sce_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_on.png b/res/drawable-xhdpi/ic_indicator_sce_on.png
index 39cfa4b..8b2440c 100644
--- a/res/drawable-xhdpi/ic_indicator_sce_on.png
+++ b/res/drawable-xhdpi/ic_indicator_sce_on.png
Binary files 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 9fa8f72..0000000
--- a/res/drawable-xhdpi/ic_settings_holo_light_xlarge.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer.png b/res/drawable-xhdpi/ic_timer.png
new file mode 100644
index 0000000..1764fdd
--- /dev/null
+++ b/res/drawable-xhdpi/ic_timer.png
Binary files differ
diff --git a/res/layout/countdown_setting_popup.xml b/res/layout/countdown_setting_popup.xml
new file mode 100644
index 0000000..22acd92
--- /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 d6e8000..0000000
--- 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 119ab1d..b810347 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 119ab1d..b810347 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 77d453c..6a6e711 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 48436c0..648f1d7 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>