New camera assets.

Bug: 6481876

Change-Id: Ic2c492403aa1b32b58bb9f9432625436bd46da0c

45 files changed, 61 insertions, 5 deletions

diff --git a/res/drawable-hdpi/bg_camera_pattern.png b/res/drawable-hdpi/bg_camera_pattern.png
deleted file mode 100644
index 82296d32..00000000
--- a/res/drawable-hdpi/bg_camera_pattern.png
+++ /dev/null
diff --git a/res/drawable-hdpi/bg_switcher.png b/res/drawable-hdpi/bg_switcher.png
deleted file mode 100644
index 57a8cf80..00000000
--- a/res/drawable-hdpi/bg_switcher.png
+++ /dev/null
diff --git a/res/drawable-hdpi/btn_camera_shutter_holo.png b/res/drawable-hdpi/btn_camera_shutter_holo.png
index 443a42b1..5ed4f4a5 100644
--- a/res/drawable-hdpi/btn_camera_shutter_holo.png
+++ b/res/drawable-hdpi/btn_camera_shutter_holo.png
diff --git a/res/drawable-hdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-hdpi/btn_camera_shutter_pressed_holo.png
index c1fd6d11..57f72d56 100644
--- a/res/drawable-hdpi/btn_camera_shutter_pressed_holo.png
+++ b/res/drawable-hdpi/btn_camera_shutter_pressed_holo.png
diff --git a/res/drawable-hdpi/btn_pan_shutter_holo.png b/res/drawable-hdpi/btn_pan_shutter_holo.png
index d1a89021..c5298747 100644
--- a/res/drawable-hdpi/btn_pan_shutter_holo.png
+++ b/res/drawable-hdpi/btn_pan_shutter_holo.png
diff --git a/res/drawable-hdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-hdpi/btn_pan_shutter_pressed_holo.png
index 809e5c0b..0c20611d 100644
--- a/res/drawable-hdpi/btn_pan_shutter_pressed_holo.png
+++ b/res/drawable-hdpi/btn_pan_shutter_pressed_holo.png
diff --git a/res/drawable-hdpi/btn_pan_shutter_recording_holo.png b/res/drawable-hdpi/btn_pan_shutter_recording_holo.png
index e39b2d4e..b8d4c2b1 100644
--- a/res/drawable-hdpi/btn_pan_shutter_recording_holo.png
+++ b/res/drawable-hdpi/btn_pan_shutter_recording_holo.png
diff --git a/res/drawable-hdpi/btn_pan_shutter_recording_pressed_holo.png b/res/drawable-hdpi/btn_pan_shutter_recording_pressed_holo.png
index 00bd11d0..d8a13fe5 100644
--- a/res/drawable-hdpi/btn_pan_shutter_recording_pressed_holo.png
+++ b/res/drawable-hdpi/btn_pan_shutter_recording_pressed_holo.png
diff --git a/res/drawable-hdpi/btn_video_shutter_holo.png b/res/drawable-hdpi/btn_video_shutter_holo.png
index f43b938d..bd91e937 100644
--- a/res/drawable-hdpi/btn_video_shutter_holo.png
+++ b/res/drawable-hdpi/btn_video_shutter_holo.png
diff --git a/res/drawable-hdpi/btn_video_shutter_pressed_holo.png b/res/drawable-hdpi/btn_video_shutter_pressed_holo.png
index 8fbcd464..78fdda2f 100644
--- a/res/drawable-hdpi/btn_video_shutter_pressed_holo.png
+++ b/res/drawable-hdpi/btn_video_shutter_pressed_holo.png
diff --git a/res/drawable-hdpi/btn_video_shutter_recording_holo.png b/res/drawable-hdpi/btn_video_shutter_recording_holo.png
index 8310e895..9bd4e2a4 100644
--- a/res/drawable-hdpi/btn_video_shutter_recording_holo.png
+++ b/res/drawable-hdpi/btn_video_shutter_recording_holo.png
diff --git a/res/drawable-hdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-hdpi/btn_video_shutter_recording_pressed_holo.png
index 1fe2cafd..a10b620c 100644
--- a/res/drawable-hdpi/btn_video_shutter_recording_pressed_holo.png
+++ b/res/drawable-hdpi/btn_video_shutter_recording_pressed_holo.png
diff --git a/res/drawable-land/bg_camera_pattern.xml b/res/drawable-land/bg_camera_pattern.xml
new file mode 100644
index 00000000..7ddb9bc6
--- /dev/null
+++ b/res/drawable-land/bg_camera_pattern.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2012, 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.
+ */
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient name="bg_camera_pattern"
+            android:startColor="#ff111111"
+            android:endColor="#ff000000"
+            android:angle="-90"
+            />
+</shape>
diff --git a/res/drawable-mdpi/bg_camera_pattern.png b/res/drawable-mdpi/bg_camera_pattern.png
deleted file mode 100644
index f5694a2b..00000000
--- a/res/drawable-mdpi/bg_camera_pattern.png
+++ /dev/null
diff --git a/res/drawable-mdpi/bg_switcher.png b/res/drawable-mdpi/bg_switcher.png
deleted file mode 100644
index e457da82..00000000
--- a/res/drawable-mdpi/bg_switcher.png
+++ /dev/null
diff --git a/res/drawable-mdpi/btn_camera_shutter_holo.png b/res/drawable-mdpi/btn_camera_shutter_holo.png
index e03a5bd2..7ea5a5d0 100644
--- a/res/drawable-mdpi/btn_camera_shutter_holo.png
+++ b/res/drawable-mdpi/btn_camera_shutter_holo.png
diff --git a/res/drawable-mdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-mdpi/btn_camera_shutter_pressed_holo.png
index 5e3abe32..3ad19d09 100644
--- a/res/drawable-mdpi/btn_camera_shutter_pressed_holo.png
+++ b/res/drawable-mdpi/btn_camera_shutter_pressed_holo.png
diff --git a/res/drawable-mdpi/btn_pan_shutter_holo.png b/res/drawable-mdpi/btn_pan_shutter_holo.png
index 27c59e76..e0c28c02 100644
--- a/res/drawable-mdpi/btn_pan_shutter_holo.png
+++ b/res/drawable-mdpi/btn_pan_shutter_holo.png
diff --git a/res/drawable-mdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-mdpi/btn_pan_shutter_pressed_holo.png
index 60e38767..e46231e6 100644
--- a/res/drawable-mdpi/btn_pan_shutter_pressed_holo.png
+++ b/res/drawable-mdpi/btn_pan_shutter_pressed_holo.png
diff --git a/res/drawable-mdpi/btn_pan_shutter_recording_holo.png b/res/drawable-mdpi/btn_pan_shutter_recording_holo.png
index b2863f0d..d2156cac 100644
--- a/res/drawable-mdpi/btn_pan_shutter_recording_holo.png
+++ b/res/drawable-mdpi/btn_pan_shutter_recording_holo.png
diff --git a/res/drawable-mdpi/btn_pan_shutter_recording_pressed_holo.png b/res/drawable-mdpi/btn_pan_shutter_recording_pressed_holo.png
index 8d234637..a25e0abe 100644
--- a/res/drawable-mdpi/btn_pan_shutter_recording_pressed_holo.png
+++ b/res/drawable-mdpi/btn_pan_shutter_recording_pressed_holo.png
diff --git a/res/drawable-mdpi/btn_video_shutter_holo.png b/res/drawable-mdpi/btn_video_shutter_holo.png
index 6274e668..3d2fce26 100644
--- a/res/drawable-mdpi/btn_video_shutter_holo.png
+++ b/res/drawable-mdpi/btn_video_shutter_holo.png
diff --git a/res/drawable-mdpi/btn_video_shutter_pressed_holo.png b/res/drawable-mdpi/btn_video_shutter_pressed_holo.png
index cedfceac..2a9bffd9 100644
--- a/res/drawable-mdpi/btn_video_shutter_pressed_holo.png
+++ b/res/drawable-mdpi/btn_video_shutter_pressed_holo.png
diff --git a/res/drawable-mdpi/btn_video_shutter_recording_holo.png b/res/drawable-mdpi/btn_video_shutter_recording_holo.png
index 10d0dc5e..ca4625fe 100644
--- a/res/drawable-mdpi/btn_video_shutter_recording_holo.png
+++ b/res/drawable-mdpi/btn_video_shutter_recording_holo.png
diff --git a/res/drawable-mdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-mdpi/btn_video_shutter_recording_pressed_holo.png
index 2de272a1..b91ce1a0 100644
--- a/res/drawable-mdpi/btn_video_shutter_recording_pressed_holo.png
+++ b/res/drawable-mdpi/btn_video_shutter_recording_pressed_holo.png
diff --git a/res/drawable-port/bg_camera_pattern.xml b/res/drawable-port/bg_camera_pattern.xml
new file mode 100644
index 00000000..63b3e6f6
--- /dev/null
+++ b/res/drawable-port/bg_camera_pattern.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2012, 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.
+ */
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient name="bg_camera_pattern"
+            android:startColor="#ff000000"
+            android:endColor="#ff111111" />
+</shape>
diff --git a/res/drawable-sw600dp-hdpi/bg_camera_pattern.png b/res/drawable-sw600dp-hdpi/bg_camera_pattern.png
deleted file mode 100644
index fff5d52f..00000000
--- a/res/drawable-sw600dp-hdpi/bg_camera_pattern.png
+++ /dev/null
diff --git a/res/drawable-sw640dp-hdpi/bg_camera_pattern.png b/res/drawable-sw640dp-hdpi/bg_camera_pattern.png
deleted file mode 100644
index fff5d52f..00000000
--- a/res/drawable-sw640dp-hdpi/bg_camera_pattern.png
+++ /dev/null
diff --git a/res/drawable-sw640dp-mdpi/bg_camera_pattern.png b/res/drawable-sw640dp-mdpi/bg_camera_pattern.png
deleted file mode 100644
index 7b120f69..00000000
--- a/res/drawable-sw640dp-mdpi/bg_camera_pattern.png
+++ /dev/null
diff --git a/res/drawable-sw640dp-xhdpi/bg_camera_pattern.png b/res/drawable-sw640dp-xhdpi/bg_camera_pattern.png
deleted file mode 100644
index 9ba99944..00000000
--- a/res/drawable-sw640dp-xhdpi/bg_camera_pattern.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/bg_camera_pattern.png b/res/drawable-xhdpi/bg_camera_pattern.png
deleted file mode 100644
index 050a419e..00000000
--- a/res/drawable-xhdpi/bg_camera_pattern.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/bg_switcher.png b/res/drawable-xhdpi/bg_switcher.png
deleted file mode 100644
index d80a3007..00000000
--- a/res/drawable-xhdpi/bg_switcher.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/btn_camera_shutter_holo.png b/res/drawable-xhdpi/btn_camera_shutter_holo.png
index d477b5bd..fa76fb3f 100644
--- a/res/drawable-xhdpi/btn_camera_shutter_holo.png
+++ b/res/drawable-xhdpi/btn_camera_shutter_holo.png
diff --git a/res/drawable-xhdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-xhdpi/btn_camera_shutter_pressed_holo.png
index 103ae4bd..bdefa3b5 100644
--- a/res/drawable-xhdpi/btn_camera_shutter_pressed_holo.png
+++ b/res/drawable-xhdpi/btn_camera_shutter_pressed_holo.png
diff --git a/res/drawable-xhdpi/btn_pan_shutter_holo.png b/res/drawable-xhdpi/btn_pan_shutter_holo.png
index e90c743c..364e56c5 100644
--- a/res/drawable-xhdpi/btn_pan_shutter_holo.png
+++ b/res/drawable-xhdpi/btn_pan_shutter_holo.png
diff --git a/res/drawable-xhdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-xhdpi/btn_pan_shutter_pressed_holo.png
index 77fce398..bdc1fb4b 100644
--- a/res/drawable-xhdpi/btn_pan_shutter_pressed_holo.png
+++ b/res/drawable-xhdpi/btn_pan_shutter_pressed_holo.png
diff --git a/res/drawable-xhdpi/btn_pan_shutter_recording_holo.png b/res/drawable-xhdpi/btn_pan_shutter_recording_holo.png
index 1f72d836..880ca990 100644
--- a/res/drawable-xhdpi/btn_pan_shutter_recording_holo.png
+++ b/res/drawable-xhdpi/btn_pan_shutter_recording_holo.png
diff --git a/res/drawable-xhdpi/btn_pan_shutter_recording_pressed_holo.png b/res/drawable-xhdpi/btn_pan_shutter_recording_pressed_holo.png
index aa654195..37d83b0f 100644
--- a/res/drawable-xhdpi/btn_pan_shutter_recording_pressed_holo.png
+++ b/res/drawable-xhdpi/btn_pan_shutter_recording_pressed_holo.png
diff --git a/res/drawable-xhdpi/btn_video_shutter_holo.png b/res/drawable-xhdpi/btn_video_shutter_holo.png
index 10f29dd6..c3d819ca 100644
--- a/res/drawable-xhdpi/btn_video_shutter_holo.png
+++ b/res/drawable-xhdpi/btn_video_shutter_holo.png
diff --git a/res/drawable-xhdpi/btn_video_shutter_pressed_holo.png b/res/drawable-xhdpi/btn_video_shutter_pressed_holo.png
index 321271ad..891859dc 100644
--- a/res/drawable-xhdpi/btn_video_shutter_pressed_holo.png
+++ b/res/drawable-xhdpi/btn_video_shutter_pressed_holo.png
diff --git a/res/drawable-xhdpi/btn_video_shutter_recording_holo.png b/res/drawable-xhdpi/btn_video_shutter_recording_holo.png
index c4a42e02..e164cae5 100644
--- a/res/drawable-xhdpi/btn_video_shutter_recording_holo.png
+++ b/res/drawable-xhdpi/btn_video_shutter_recording_holo.png
diff --git a/res/drawable-xhdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-xhdpi/btn_video_shutter_recording_pressed_holo.png
index 694dcb99..164cd368 100644
--- a/res/drawable-xhdpi/btn_video_shutter_recording_pressed_holo.png
+++ b/res/drawable-xhdpi/btn_video_shutter_recording_pressed_holo.png
diff --git a/res/drawable/bg_mode_picker.xml b/res/drawable/bg_mode_picker.xml
index 39b296ef..07b9419b 100644
--- a/res/drawable/bg_mode_picker.xml
+++ b/res/drawable/bg_mode_picker.xml
@@ -16,5 +16,5 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/list_pressed_holo_light" />
-    <item android:drawable="@drawable/bg_switcher" />
+    <item android:drawable="@android:color/black" />
 </selector>
diff --git a/res/layout-land/mode_picker.xml b/res/layout-land/mode_picker.xml
index 814b82e0..7028ab04 100644
--- a/res/layout-land/mode_picker.xml
+++ b/res/layout-land/mode_picker.xml
@@ -58,16 +58,20 @@
         <View android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_alignParentTop="true"
-                android:background="@android:color/white"/>
+                android:layout_marginRight="8dp"
+                android:layout_marginLeft="8dp"
+                android:background="#33ffffff"/>
     </RelativeLayout>
     <LinearLayout android:id="@+id/mode_selection"
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="163dp"
-            android:background="@drawable/bg_switcher"
+            android:background="@android:color/black"
             android:visibility="gone">
         <View android:layout_width="match_parent"
                 android:layout_height="1dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginLeft="8dp"
                 android:background="@color/mode_selection_border"/>
         <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama"
                 android:contentDescription="@string/accessibility_switch_to_panorama"
diff --git a/res/layout-port/mode_picker.xml b/res/layout-port/mode_picker.xml
index c4932011..ff2c1624 100644
--- a/res/layout-port/mode_picker.xml
+++ b/res/layout-port/mode_picker.xml
@@ -58,13 +58,15 @@
         <View android:layout_height="match_parent"
                 android:layout_width="1dp"
                 android:layout_alignParentRight="true"
-                android:background="@android:color/white"/>
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:background="#33ffffff"/>
     </RelativeLayout>
     <LinearLayout android:id="@+id/mode_selection"
             android:orientation="horizontal"
             android:layout_height="match_parent"
             android:layout_width="163dp"
-            android:background="@drawable/bg_switcher"
+            android:background="@android:color/black"
             android:visibility="gone">
         <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera"
                 android:contentDescription="@string/accessibility_switch_to_camera"
@@ -89,6 +91,8 @@
                 android:src="@drawable/ic_switch_pan_holo_light" />
         <View android:layout_height="match_parent"
                 android:layout_width="1dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:background="@color/mode_selection_border"/>
     </LinearLayout>
 </com.android.camera.ModePicker>