resolved conflicts for merge of e293317f to master

Change-Id: I395d7d596414d118ebb788ef5a46e052785935a7

31 files changed, 166 insertions, 0 deletions

diff --git a/res/drawable-sw485dp/btn_ic_camera_shutter.xml b/res/drawable-sw485dp/btn_ic_camera_shutter.xml
new file mode 100644
index 0000000..aa98917
--- /dev/null
+++ b/res/drawable-sw485dp/btn_ic_camera_shutter.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/button_ic_camera_shutter_pressed" />
+    <item android:drawable="@drawable/button_ic_camera_shutter" />
+</selector>
+
diff --git a/res/drawable-sw485dp/btn_ic_mode_switch_camera.xml b/res/drawable-sw485dp/btn_ic_mode_switch_camera.xml
new file mode 100644
index 0000000..e0e4952
--- /dev/null
+++ b/res/drawable-sw485dp/btn_ic_mode_switch_camera.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:drawable="@drawable/ic_switch_camera_selected_holo_dark" />
+    <item android:drawable="@drawable/ic_switch_camera_holo_dark" />
+</selector>
diff --git a/res/drawable-sw485dp/btn_ic_mode_switch_video.xml b/res/drawable-sw485dp/btn_ic_mode_switch_video.xml
new file mode 100644
index 0000000..018dcfc
--- /dev/null
+++ b/res/drawable-sw485dp/btn_ic_mode_switch_video.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:drawable="@drawable/ic_switch_video_selected_holo_dark" />
+    <item android:drawable="@drawable/ic_switch_video_holo_dark" />
+</selector>
diff --git a/res/drawable-sw485dp/btn_ic_review_play.png b/res/drawable-sw485dp/btn_ic_review_play.png
new file mode 100755
index 0000000..6eca85c
--- /dev/null
+++ b/res/drawable-sw485dp/btn_ic_review_play.png
diff --git a/res/drawable-sw485dp/btn_ic_video_record_stop.png b/res/drawable-sw485dp/btn_ic_video_record_stop.png
new file mode 100755
index 0000000..b123eaf
--- /dev/null
+++ b/res/drawable-sw485dp/btn_ic_video_record_stop.png
diff --git a/res/drawable-sw485dp/btn_review_control.xml b/res/drawable-sw485dp/btn_review_control.xml
new file mode 100644
index 0000000..1dd81ca
--- /dev/null
+++ b/res/drawable-sw485dp/btn_review_control.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/bg_text_on_preview_pressed" />
+    <item android:drawable="@drawable/bg_text_on_preview_transparent" />
+</selector>
+
diff --git a/res/drawable-sw485dp/btn_shutter.xml b/res/drawable-sw485dp/btn_shutter.xml
new file mode 100644
index 0000000..d1772ae
--- /dev/null
+++ b/res/drawable-sw485dp/btn_shutter.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/button_camera_shutter_pressed_holo" />
+    <item android:drawable="@drawable/button_camera_shutter_holo" />
+</selector>
+
diff --git a/res/drawable-sw485dp/btn_shutter_recording.xml b/res/drawable-sw485dp/btn_shutter_recording.xml
new file mode 100644
index 0000000..c2a07ff
--- /dev/null
+++ b/res/drawable-sw485dp/btn_shutter_recording.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/button_video_shutter_pressed_holo" />
+    <item android:drawable="@drawable/button_video_shutter_holo" />
+</selector>
+
diff --git a/res/drawable-sw485dp/btn_zoom_in.xml b/res/drawable-sw485dp/btn_zoom_in.xml
new file mode 100644
index 0000000..d798b5a
--- /dev/null
+++ b/res/drawable-sw485dp/btn_zoom_in.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/button_zoom_in_pressed_holo" />
+    <item android:state_enabled="false" android:drawable="@drawable/button_zoom_in_disabled_holo" />
+    <item android:drawable="@drawable/button_zoom_in_holo" />
+</selector>
diff --git a/res/drawable-sw485dp/btn_zoom_out.xml b/res/drawable-sw485dp/btn_zoom_out.xml
new file mode 100644
index 0000000..925327d
--- /dev/null
+++ b/res/drawable-sw485dp/btn_zoom_out.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/button_zoom_out_pressed_holo" />
+    <item android:state_enabled="false" android:drawable="@drawable/button_zoom_out_disabled_holo" />
+    <item android:drawable="@drawable/button_zoom_out_holo" />
+</selector>
diff --git a/res/drawable-sw485dp/button_camera_shutter_holo.png b/res/drawable-sw485dp/button_camera_shutter_holo.png
new file mode 100644
index 0000000..556c921
--- /dev/null
+++ b/res/drawable-sw485dp/button_camera_shutter_holo.png
diff --git a/res/drawable-sw485dp/button_camera_shutter_pressed_holo.png b/res/drawable-sw485dp/button_camera_shutter_pressed_holo.png
new file mode 100644
index 0000000..7ccc389
--- /dev/null
+++ b/res/drawable-sw485dp/button_camera_shutter_pressed_holo.png
diff --git a/res/drawable-sw485dp/button_ic_camera_shutter.png b/res/drawable-sw485dp/button_ic_camera_shutter.png
new file mode 100644
index 0000000..34a36af
--- /dev/null
+++ b/res/drawable-sw485dp/button_ic_camera_shutter.png
diff --git a/res/drawable-sw485dp/button_ic_camera_shutter_pressed.png b/res/drawable-sw485dp/button_ic_camera_shutter_pressed.png
new file mode 100644
index 0000000..baa0c3f
--- /dev/null
+++ b/res/drawable-sw485dp/button_ic_camera_shutter_pressed.png
diff --git a/res/drawable-sw485dp/button_video_shutter_holo.png b/res/drawable-sw485dp/button_video_shutter_holo.png
new file mode 100644
index 0000000..8c8b4df
--- /dev/null
+++ b/res/drawable-sw485dp/button_video_shutter_holo.png
diff --git a/res/drawable-sw485dp/button_video_shutter_pressed_holo.png b/res/drawable-sw485dp/button_video_shutter_pressed_holo.png
new file mode 100644
index 0000000..903a57a
--- /dev/null
+++ b/res/drawable-sw485dp/button_video_shutter_pressed_holo.png
diff --git a/res/drawable-sw485dp/ic_time_lapse_holo_dark.png b/res/drawable-sw485dp/ic_time_lapse_holo_dark.png
new file mode 100644
index 0000000..2bb9c57
--- /dev/null
+++ b/res/drawable-sw485dp/ic_time_lapse_holo_dark.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_coloreffect.png b/res/drawable-sw485dp/ic_viewfinder_coloreffect.png
new file mode 100644
index 0000000..738ef05
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_coloreffect.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_flash_auto.png b/res/drawable-sw485dp/ic_viewfinder_flash_auto.png
new file mode 100644
index 0000000..7b1cb6c
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_flash_auto.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_flash_off.png b/res/drawable-sw485dp/ic_viewfinder_flash_off.png
new file mode 100644
index 0000000..ecf8220
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_flash_off.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_flash_on.png b/res/drawable-sw485dp/ic_viewfinder_flash_on.png
new file mode 100644
index 0000000..c01a882
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_flash_on.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_scene_mode.png b/res/drawable-sw485dp/ic_viewfinder_scene_mode.png
new file mode 100644
index 0000000..d11b057
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_scene_mode.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_settings.png b/res/drawable-sw485dp/ic_viewfinder_settings.png
new file mode 100644
index 0000000..3093ed7
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_settings.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_share.png b/res/drawable-sw485dp/ic_viewfinder_share.png
new file mode 100644
index 0000000..d8f223a
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_share.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_video_quality_high.png b/res/drawable-sw485dp/ic_viewfinder_video_quality_high.png
new file mode 100644
index 0000000..2fcbd8b
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_video_quality_high.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_video_quality_low.png b/res/drawable-sw485dp/ic_viewfinder_video_quality_low.png
new file mode 100644
index 0000000..9158059
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_video_quality_low.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_video_quality_youtube.png b/res/drawable-sw485dp/ic_viewfinder_video_quality_youtube.png
new file mode 100644
index 0000000..7d279af
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_video_quality_youtube.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_wb_auto.png b/res/drawable-sw485dp/ic_viewfinder_wb_auto.png
new file mode 100644
index 0000000..cf8ddb4
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_wb_auto.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_wb_daylight.png b/res/drawable-sw485dp/ic_viewfinder_wb_daylight.png
new file mode 100644
index 0000000..6472b09
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_wb_daylight.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_wb_fluorescent.png b/res/drawable-sw485dp/ic_viewfinder_wb_fluorescent.png
new file mode 100644
index 0000000..509f436
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_wb_fluorescent.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_wb_incandescent.png b/res/drawable-sw485dp/ic_viewfinder_wb_incandescent.png
new file mode 100644
index 0000000..1ef4d2e
--- /dev/null
+++ b/res/drawable-sw485dp/ic_viewfinder_wb_incandescent.png