SnapdragonCamera: New shutter Icons

Add new shutter icons for SnapdragonCamera

Change-Id: Ic0abf1b509800133bbd9dbee0cc34ebca02e5bcb

53 files changed, 79 insertions, 17 deletions

diff --git a/res/drawable-hdpi/remaining_sheets.png b/res/drawable-hdpi/remaining_sheets.png
new file mode 100644
index 000000000..f35a61820
--- /dev/null
+++ b/res/drawable-hdpi/remaining_sheets.png
diff --git a/res/drawable-hdpi/shutter_button_0.png b/res/drawable-hdpi/shutter_button_0.png
index 34235137b..7cf89377a 100644
--- a/res/drawable-hdpi/shutter_button_0.png
+++ b/res/drawable-hdpi/shutter_button_0.png
diff --git a/res/drawable-hdpi/shutter_button_1.png b/res/drawable-hdpi/shutter_button_1.png
index c2b6c3a73..070a3c412 100644
--- a/res/drawable-hdpi/shutter_button_1.png
+++ b/res/drawable-hdpi/shutter_button_1.png
diff --git a/res/drawable-hdpi/shutter_button_2.png b/res/drawable-hdpi/shutter_button_2.png
index df8e915d1..acb8a56eb 100644
--- a/res/drawable-hdpi/shutter_button_2.png
+++ b/res/drawable-hdpi/shutter_button_2.png
diff --git a/res/drawable-hdpi/shutter_button_3.png b/res/drawable-hdpi/shutter_button_3.png
index fb703b4e6..fe565c9e6 100644
--- a/res/drawable-hdpi/shutter_button_3.png
+++ b/res/drawable-hdpi/shutter_button_3.png
diff --git a/res/drawable-hdpi/shutter_button_4.png b/res/drawable-hdpi/shutter_button_4.png
index 52c158e18..d3ef0bbfe 100644
--- a/res/drawable-hdpi/shutter_button_4.png
+++ b/res/drawable-hdpi/shutter_button_4.png
diff --git a/res/drawable-hdpi/shutter_button_5.png b/res/drawable-hdpi/shutter_button_5.png
index fdd6ff4f8..e0b7fb43a 100644
--- a/res/drawable-hdpi/shutter_button_5.png
+++ b/res/drawable-hdpi/shutter_button_5.png
diff --git a/res/drawable-hdpi/shutter_button_6.png b/res/drawable-hdpi/shutter_button_6.png
index 32e43a1b3..064b4d213 100644
--- a/res/drawable-hdpi/shutter_button_6.png
+++ b/res/drawable-hdpi/shutter_button_6.png
diff --git a/res/drawable-hdpi/shutter_button_7.png b/res/drawable-hdpi/shutter_button_7.png
index eabe57e85..607a9cc6e 100644
--- a/res/drawable-hdpi/shutter_button_7.png
+++ b/res/drawable-hdpi/shutter_button_7.png
diff --git a/res/drawable-hdpi/shutter_button_dim.png b/res/drawable-hdpi/shutter_button_dim.png
index 484312af0..a721bb97e 100644
--- a/res/drawable-hdpi/shutter_button_dim.png
+++ b/res/drawable-hdpi/shutter_button_dim.png
diff --git a/res/drawable-hdpi/shutter_button_stop.png b/res/drawable-hdpi/shutter_button_stop.png
index bd10a5a96..ae6c1dc79 100644
--- a/res/drawable-hdpi/shutter_button_stop.png
+++ b/res/drawable-hdpi/shutter_button_stop.png
diff --git a/res/drawable-hdpi/shutter_button_video.png b/res/drawable-hdpi/shutter_button_video.png
index de9075992..345c41891 100644
--- a/res/drawable-hdpi/shutter_button_video.png
+++ b/res/drawable-hdpi/shutter_button_video.png
diff --git a/res/drawable-hdpi/shutter_button_video_dim.png b/res/drawable-hdpi/shutter_button_video_dim.png
index bfe5b53b4..88fad94e9 100644
--- a/res/drawable-hdpi/shutter_button_video_dim.png
+++ b/res/drawable-hdpi/shutter_button_video_dim.png
diff --git a/res/drawable-hdpi/shutter_button_video_stop.png b/res/drawable-hdpi/shutter_button_video_stop.png
index f25c5e2d6..f5e1fb8ed 100644
--- a/res/drawable-hdpi/shutter_button_video_stop.png
+++ b/res/drawable-hdpi/shutter_button_video_stop.png
diff --git a/res/drawable-hdpi/shutter_panorama.png b/res/drawable-hdpi/shutter_panorama.png
new file mode 100644
index 000000000..b0cce274c
--- /dev/null
+++ b/res/drawable-hdpi/shutter_panorama.png
diff --git a/res/drawable-hdpi/shutter_panorama_dim.png b/res/drawable-hdpi/shutter_panorama_dim.png
new file mode 100644
index 000000000..d7c7a0625
--- /dev/null
+++ b/res/drawable-hdpi/shutter_panorama_dim.png
diff --git a/res/drawable-mdpi/remaining_sheets.png b/res/drawable-mdpi/remaining_sheets.png
new file mode 100644
index 000000000..3326cf92e
--- /dev/null
+++ b/res/drawable-mdpi/remaining_sheets.png
diff --git a/res/drawable-mdpi/shutter_button_0.png b/res/drawable-mdpi/shutter_button_0.png
index 8e4d3a56c..f391e4760 100644
--- a/res/drawable-mdpi/shutter_button_0.png
+++ b/res/drawable-mdpi/shutter_button_0.png
diff --git a/res/drawable-mdpi/shutter_button_1.png b/res/drawable-mdpi/shutter_button_1.png
index 403f0553b..046353879 100644
--- a/res/drawable-mdpi/shutter_button_1.png
+++ b/res/drawable-mdpi/shutter_button_1.png
diff --git a/res/drawable-mdpi/shutter_button_2.png b/res/drawable-mdpi/shutter_button_2.png
index 0d1230520..93aaf13fe 100644
--- a/res/drawable-mdpi/shutter_button_2.png
+++ b/res/drawable-mdpi/shutter_button_2.png
diff --git a/res/drawable-mdpi/shutter_button_3.png b/res/drawable-mdpi/shutter_button_3.png
index 10a44cb86..d1cef63f7 100644
--- a/res/drawable-mdpi/shutter_button_3.png
+++ b/res/drawable-mdpi/shutter_button_3.png
diff --git a/res/drawable-mdpi/shutter_button_4.png b/res/drawable-mdpi/shutter_button_4.png
index e0e08c50b..2e603f931 100644
--- a/res/drawable-mdpi/shutter_button_4.png
+++ b/res/drawable-mdpi/shutter_button_4.png
diff --git a/res/drawable-mdpi/shutter_button_5.png b/res/drawable-mdpi/shutter_button_5.png
index 38f237f04..8cf5e92ee 100644
--- a/res/drawable-mdpi/shutter_button_5.png
+++ b/res/drawable-mdpi/shutter_button_5.png
diff --git a/res/drawable-mdpi/shutter_button_6.png b/res/drawable-mdpi/shutter_button_6.png
index 56ef981ee..014468da6 100644
--- a/res/drawable-mdpi/shutter_button_6.png
+++ b/res/drawable-mdpi/shutter_button_6.png
diff --git a/res/drawable-mdpi/shutter_button_7.png b/res/drawable-mdpi/shutter_button_7.png
index a6a397bde..4c4038ef2 100644
--- a/res/drawable-mdpi/shutter_button_7.png
+++ b/res/drawable-mdpi/shutter_button_7.png
diff --git a/res/drawable-mdpi/shutter_button_dim.png b/res/drawable-mdpi/shutter_button_dim.png
index 915462223..6f8b35bc3 100644
--- a/res/drawable-mdpi/shutter_button_dim.png
+++ b/res/drawable-mdpi/shutter_button_dim.png
diff --git a/res/drawable-mdpi/shutter_button_stop.png b/res/drawable-mdpi/shutter_button_stop.png
index 502fac57a..7058814e3 100644
--- a/res/drawable-mdpi/shutter_button_stop.png
+++ b/res/drawable-mdpi/shutter_button_stop.png
diff --git a/res/drawable-mdpi/shutter_button_video.png b/res/drawable-mdpi/shutter_button_video.png
index 9eab7f379..1fad54077 100644
--- a/res/drawable-mdpi/shutter_button_video.png
+++ b/res/drawable-mdpi/shutter_button_video.png
diff --git a/res/drawable-mdpi/shutter_button_video_dim.png b/res/drawable-mdpi/shutter_button_video_dim.png
index 95fe21a2c..721abc37a 100644
--- a/res/drawable-mdpi/shutter_button_video_dim.png
+++ b/res/drawable-mdpi/shutter_button_video_dim.png
diff --git a/res/drawable-mdpi/shutter_button_video_stop.png b/res/drawable-mdpi/shutter_button_video_stop.png
index 5f8cacc9a..00985ae33 100644
--- a/res/drawable-mdpi/shutter_button_video_stop.png
+++ b/res/drawable-mdpi/shutter_button_video_stop.png
diff --git a/res/drawable-mdpi/shutter_panorama.png b/res/drawable-mdpi/shutter_panorama.png
new file mode 100644
index 000000000..5757c0ba4
--- /dev/null
+++ b/res/drawable-mdpi/shutter_panorama.png
diff --git a/res/drawable-mdpi/shutter_panorama_dim.png b/res/drawable-mdpi/shutter_panorama_dim.png
new file mode 100644
index 000000000..b6e22f920
--- /dev/null
+++ b/res/drawable-mdpi/shutter_panorama_dim.png
diff --git a/res/drawable-xhdpi/remaining_sheets.png b/res/drawable-xhdpi/remaining_sheets.png
new file mode 100644
index 000000000..fe13a55e0
--- /dev/null
+++ b/res/drawable-xhdpi/remaining_sheets.png
diff --git a/res/drawable-xhdpi/shutter_button_0.png b/res/drawable-xhdpi/shutter_button_0.png
index f2605f576..b8a4da85f 100644
--- a/res/drawable-xhdpi/shutter_button_0.png
+++ b/res/drawable-xhdpi/shutter_button_0.png
diff --git a/res/drawable-xhdpi/shutter_button_1.png b/res/drawable-xhdpi/shutter_button_1.png
index dca24515b..5799dd5f1 100644
--- a/res/drawable-xhdpi/shutter_button_1.png
+++ b/res/drawable-xhdpi/shutter_button_1.png
diff --git a/res/drawable-xhdpi/shutter_button_2.png b/res/drawable-xhdpi/shutter_button_2.png
index b1990b524..9a4011138 100644
--- a/res/drawable-xhdpi/shutter_button_2.png
+++ b/res/drawable-xhdpi/shutter_button_2.png
diff --git a/res/drawable-xhdpi/shutter_button_3.png b/res/drawable-xhdpi/shutter_button_3.png
index 868efb8f1..20834a536 100644
--- a/res/drawable-xhdpi/shutter_button_3.png
+++ b/res/drawable-xhdpi/shutter_button_3.png
diff --git a/res/drawable-xhdpi/shutter_button_4.png b/res/drawable-xhdpi/shutter_button_4.png
index f808c3d07..009e775a2 100644
--- a/res/drawable-xhdpi/shutter_button_4.png
+++ b/res/drawable-xhdpi/shutter_button_4.png
diff --git a/res/drawable-xhdpi/shutter_button_5.png b/res/drawable-xhdpi/shutter_button_5.png
index a4a8feb51..b526acc5d 100644
--- a/res/drawable-xhdpi/shutter_button_5.png
+++ b/res/drawable-xhdpi/shutter_button_5.png
diff --git a/res/drawable-xhdpi/shutter_button_6.png b/res/drawable-xhdpi/shutter_button_6.png
index dbd0c00af..874ac02f4 100644
--- a/res/drawable-xhdpi/shutter_button_6.png
+++ b/res/drawable-xhdpi/shutter_button_6.png
diff --git a/res/drawable-xhdpi/shutter_button_7.png b/res/drawable-xhdpi/shutter_button_7.png
index 6be9eab6f..95cbc975f 100644
--- a/res/drawable-xhdpi/shutter_button_7.png
+++ b/res/drawable-xhdpi/shutter_button_7.png
diff --git a/res/drawable-xhdpi/shutter_button_dim.png b/res/drawable-xhdpi/shutter_button_dim.png
index 0087350ca..187bfcbe7 100644
--- a/res/drawable-xhdpi/shutter_button_dim.png
+++ b/res/drawable-xhdpi/shutter_button_dim.png
diff --git a/res/drawable-xhdpi/shutter_button_stop.png b/res/drawable-xhdpi/shutter_button_stop.png
index f151d4e14..88f60d3c4 100644
--- a/res/drawable-xhdpi/shutter_button_stop.png
+++ b/res/drawable-xhdpi/shutter_button_stop.png
diff --git a/res/drawable-xhdpi/shutter_button_video.png b/res/drawable-xhdpi/shutter_button_video.png
index 444bf78bf..da58053fe 100644
--- a/res/drawable-xhdpi/shutter_button_video.png
+++ b/res/drawable-xhdpi/shutter_button_video.png
diff --git a/res/drawable-xhdpi/shutter_button_video_dim.png b/res/drawable-xhdpi/shutter_button_video_dim.png
index 7d28d6430..fc41296f8 100644
--- a/res/drawable-xhdpi/shutter_button_video_dim.png
+++ b/res/drawable-xhdpi/shutter_button_video_dim.png
diff --git a/res/drawable-xhdpi/shutter_button_video_stop.png b/res/drawable-xhdpi/shutter_button_video_stop.png
index b54f737d7..44df24b97 100644
--- a/res/drawable-xhdpi/shutter_button_video_stop.png
+++ b/res/drawable-xhdpi/shutter_button_video_stop.png
diff --git a/res/drawable-xhdpi/shutter_panorama.png b/res/drawable-xhdpi/shutter_panorama.png
new file mode 100644
index 000000000..b8ee5d207
--- /dev/null
+++ b/res/drawable-xhdpi/shutter_panorama.png
diff --git a/res/drawable-xhdpi/shutter_panorama_dim.png b/res/drawable-xhdpi/shutter_panorama_dim.png
new file mode 100644
index 000000000..606032b5a
--- /dev/null
+++ b/res/drawable-xhdpi/shutter_panorama_dim.png
diff --git a/res/drawable-xxhdpi/remaining_sheets.png b/res/drawable-xxhdpi/remaining_sheets.png
new file mode 100644
index 000000000..43932d2d6
--- /dev/null
+++ b/res/drawable-xxhdpi/remaining_sheets.png
diff --git a/res/drawable/btn_new_shutter_panorama.xml b/res/drawable/btn_new_shutter_panorama.xml
new file mode 100644
index 000000000..fecaece79
--- /dev/null
+++ b/res/drawable/btn_new_shutter_panorama.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions are
+     met:
+         * Redistributions of source code must retain the above copyright
+           notice, this list of conditions and the following disclaimer.
+         * Redistributions in binary form must reproduce the above
+           copyright notice, this list of conditions and the following
+           disclaimer in the documentation and/or other materials provided
+           with the distribution.
+         * Neither the name of The Linux Foundation nor the names of its
+           contributors may be used to endorse or promote products derived
+           from this software without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+     WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+     ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+     BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/shutter_panorama_dim" />
+    <item android:drawable="@drawable/shutter_panorama" />
+</selector>
+
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index eecc13f2e..f10ae9271 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -54,14 +54,14 @@
 
     <com.android.camera.ShutterButton
         android:id="@+id/shutter_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/shutter_size"
+        android:layout_height="@dimen/shutter_size"
         android:layout_gravity="right|center_vertical"
         android:layout_marginRight="@dimen/shutter_offset"
         android:clickable="true"
         android:contentDescription="@string/accessibility_shutter_button"
         android:focusable="true"
-        android:scaleType="center"
+        android:scaleType="fitCenter"
         android:src="@drawable/btn_new_shutter" />
 
     <com.android.camera.ui.RotateImageView
@@ -109,12 +109,26 @@
             android:layout_gravity="center" />
     </com.android.camera.ui.RotatableLayout>
 
-    <TextView
+    <LinearLayout
         android:id="@+id/remaining_photos"
-        android:background="@android:color/transparent"
-        android:textColor="@android:color/white"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone" />
+        android:background="@android:color/transparent"
+        android:orientation="horizontal"
+        android:visibility="gone" >
+
+        <TextView
+            android:id="@+id/remaining_photos_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:textColor="@android:color/white" />
+
+        <ImageView
+            android:id="@+id/remaining_photos_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/remaining_sheets" />
+    </LinearLayout>
 
-</com.android.camera.ui.CameraControls>
+</com.android.camera.ui.CameraControls>
\ No newline at end of file
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index 52be755dd..ee24cfef2 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -54,14 +54,14 @@
 
     <com.android.camera.ShutterButton
         android:id="@+id/shutter_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/shutter_size"
+        android:layout_height="@dimen/shutter_size"
         android:layout_gravity="bottom|center_horizontal"
         android:layout_marginBottom="@dimen/shutter_offset"
         android:clickable="true"
         android:contentDescription="@string/accessibility_shutter_button"
         android:focusable="true"
-        android:scaleType="center"
+        android:scaleType="fitCenter"
         android:src="@drawable/btn_new_shutter" />
 
     <com.android.camera.ui.RotateImageView
@@ -109,12 +109,26 @@
             android:layout_gravity="center" />
     </com.android.camera.ui.RotatableLayout>
 
-    <TextView
+    <LinearLayout
         android:id="@+id/remaining_photos"
-        android:background="@android:color/transparent"
-        android:textColor="@android:color/white"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone" />
+        android:background="@android:color/transparent"
+        android:orientation="horizontal"
+        android:visibility="gone" >
+
+        <TextView
+            android:id="@+id/remaining_photos_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:textColor="@android:color/white" />
+
+        <ImageView
+            android:id="@+id/remaining_photos_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/remaining_sheets" />
+    </LinearLayout>
 
-</com.android.camera.ui.CameraControls>
+</com.android.camera.ui.CameraControls>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d162adf17..327b30bbd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -98,7 +98,7 @@
     <dimen name="toggle_outer_size">60dp</dimen>
     <dimen name="face_circle_stroke">2dip</dimen>
     <dimen name="zoom_font_size">14pt</dimen>
-    <dimen name="shutter_offset">5dp</dimen>
+    <dimen name="shutter_offset">11dp</dimen>
     <dimen name="size_thumbnail">200dip</dimen>
     <dimen name="size_preview">400dip</dimen>
     <dimen name="navigation_bar_height">48dip</dimen>
@@ -109,6 +109,7 @@
     <dimen name="capture_margin_top">16dip</dimen>
     <dimen name="camera_controls_size">0dip</dimen>
     <dimen name="camera_film_strip_gap">32dip</dimen>
+    <dimen name="shutter_size">80dp</dimen>
 
     <dimen name="appwidget_width">180dp</dimen>
     <dimen name="appwidget_height">180dp</dimen>