From adab2bddc93bf4af535cb58e7167bf8690d97d8c Mon Sep 17 00:00:00 2001
From: Chung-yih Wang <cywang@google.com>
Date: Mon, 15 Aug 2011 12:43:23 +0800
Subject: Add Sprung Lever Zoom Control for Phone UI.

bug:5083780
Change-Id: I5b29f6bc509fc93ed74175e2754ce9f3c4afe27f
---
 res/anim/grow_fade_in_from_bottom.xml              |  26 ++++++++++
 res/anim/shrink_fade_out_from_top.xml              |  26 ++++++++++
 res/drawable-hdpi/btn_close_settings.png           | Bin 0 -> 3655 bytes
 res/drawable-hdpi/btn_zoom_control.png             | Bin 0 -> 16386 bytes
 res/drawable-hdpi/ic_rotate_camera_facing_back.png | Bin 0 -> 2327 bytes
 .../ic_rotate_camera_facing_forward.png            | Bin 0 -> 2322 bytes
 res/drawable-hdpi/ic_settings_holo_light.png       | Bin 0 -> 1975 bytes
 res/drawable-hdpi/ic_zoom_big.9.png                | Bin 0 -> 220 bytes
 res/drawable-hdpi/ic_zoom_in_holo_light.png        | Bin 0 -> 542 bytes
 res/drawable-hdpi/ic_zoom_out_holo_light.png       | Bin 0 -> 404 bytes
 res/drawable-hdpi/ic_zoom_slider.png               | Bin 0 -> 1489 bytes
 res/drawable-hdpi/ic_zoom_slider_pressed.png       | Bin 0 -> 2814 bytes
 res/drawable-mdpi/ic_rotate_camera_facing_back.png | Bin 0 -> 1387 bytes
 .../ic_rotate_camera_facing_forward.png            | Bin 0 -> 1375 bytes
 res/drawable-mdpi/ic_settings_holo_light.png       | Bin 0 -> 1277 bytes
 res/drawable-mdpi/ic_zoom_in_holo_light.png        | Bin 0 -> 450 bytes
 res/drawable-mdpi/ic_zoom_out_holo_light.png       | Bin 0 -> 381 bytes
 res/drawable-mdpi/ic_zoom_slider.png               | Bin 0 -> 946 bytes
 res/drawable-mdpi/ic_zoom_slider_pressed.png       | Bin 0 -> 1715 bytes
 .../ic_rotate_camera_facing_back.png               | Bin 0 -> 3246 bytes
 .../ic_rotate_camera_facing_forward.png            | Bin 0 -> 3284 bytes
 res/drawable-xhdpi/ic_settings_holo_light.png      | Bin 0 -> 2664 bytes
 res/drawable-xhdpi/ic_zoom_in_holo_light.png       | Bin 0 -> 583 bytes
 res/drawable-xhdpi/ic_zoom_out_holo_light.png      | Bin 0 -> 414 bytes
 res/drawable-xhdpi/ic_zoom_slider.png              | Bin 0 -> 1996 bytes
 res/drawable-xhdpi/ic_zoom_slider_pressed.png      | Bin 0 -> 3521 bytes
 res/drawable/btn_zoom_slider.xml                   |  21 ++++++++
 res/layout-w1024dp/camera_control.xml              |   5 ++
 res/layout/camera_control.xml                      |  14 +++---
 res/layout/indicator_bar.xml                       |  54 +++++++++++++++++++++
 res/layout/preview_frame.xml                       |   7 +--
 res/layout/preview_frame_video.xml                 |   7 +--
 32 files changed, 141 insertions(+), 19 deletions(-)
 create mode 100644 res/anim/grow_fade_in_from_bottom.xml
 create mode 100644 res/anim/shrink_fade_out_from_top.xml
 create mode 100644 res/drawable-hdpi/btn_close_settings.png
 create mode 100644 res/drawable-hdpi/btn_zoom_control.png
 create mode 100644 res/drawable-hdpi/ic_rotate_camera_facing_back.png
 create mode 100644 res/drawable-hdpi/ic_rotate_camera_facing_forward.png
 create mode 100644 res/drawable-hdpi/ic_settings_holo_light.png
 create mode 100644 res/drawable-hdpi/ic_zoom_big.9.png
 create mode 100644 res/drawable-hdpi/ic_zoom_in_holo_light.png
 create mode 100644 res/drawable-hdpi/ic_zoom_out_holo_light.png
 create mode 100644 res/drawable-hdpi/ic_zoom_slider.png
 create mode 100644 res/drawable-hdpi/ic_zoom_slider_pressed.png
 create mode 100644 res/drawable-mdpi/ic_rotate_camera_facing_back.png
 create mode 100644 res/drawable-mdpi/ic_rotate_camera_facing_forward.png
 create mode 100644 res/drawable-mdpi/ic_settings_holo_light.png
 create mode 100644 res/drawable-mdpi/ic_zoom_in_holo_light.png
 create mode 100644 res/drawable-mdpi/ic_zoom_out_holo_light.png
 create mode 100644 res/drawable-mdpi/ic_zoom_slider.png
 create mode 100644 res/drawable-mdpi/ic_zoom_slider_pressed.png
 create mode 100644 res/drawable-xhdpi/ic_rotate_camera_facing_back.png
 create mode 100644 res/drawable-xhdpi/ic_rotate_camera_facing_forward.png
 create mode 100644 res/drawable-xhdpi/ic_settings_holo_light.png
 create mode 100644 res/drawable-xhdpi/ic_zoom_in_holo_light.png
 create mode 100644 res/drawable-xhdpi/ic_zoom_out_holo_light.png
 create mode 100644 res/drawable-xhdpi/ic_zoom_slider.png
 create mode 100644 res/drawable-xhdpi/ic_zoom_slider_pressed.png
 create mode 100644 res/drawable/btn_zoom_slider.xml
 create mode 100644 res/layout/indicator_bar.xml

(limited to 'res')

diff --git a/res/anim/grow_fade_in_from_bottom.xml b/res/anim/grow_fade_in_from_bottom.xml
new file mode 100644
index 0000000..df5bdf4
--- /dev/null
+++ b/res/anim/grow_fade_in_from_bottom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false">
+    <scale android:interpolator="@android:interpolator/decelerate_quint"
+            android:fromXScale="1.0" android:toXScale="1.0"
+            android:fromYScale="0.2" android:toYScale="1.0"
+            android:pivotX="100%" android:pivotY="100%"
+            android:duration="300" />
+    <alpha android:interpolator="@android:interpolator/decelerate_cubic"
+            android:fromAlpha="0.5" android:toAlpha="1.0"
+            android:duration="300" />
+</set>
diff --git a/res/anim/shrink_fade_out_from_top.xml b/res/anim/shrink_fade_out_from_top.xml
new file mode 100644
index 0000000..4df151c
--- /dev/null
+++ b/res/anim/shrink_fade_out_from_top.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false">
+    <scale android:interpolator="@android:interpolator/decelerate_quint"
+            android:fromXScale="1.0" android:toXScale="1.0"
+            android:fromYScale="1.0" android:toYScale="0.2"
+            android:pivotX="100%" android:pivotY="100%"
+            android:duration="300" />
+    <alpha android:interpolator="@android:interpolator/decelerate_cubic"
+            android:fromAlpha="1.0" android:toAlpha="0.0"
+            android:duration="300" />
+</set>
diff --git a/res/drawable-hdpi/btn_close_settings.png b/res/drawable-hdpi/btn_close_settings.png
new file mode 100644
index 0000000..3774aea
Binary files /dev/null and b/res/drawable-hdpi/btn_close_settings.png differ
diff --git a/res/drawable-hdpi/btn_zoom_control.png b/res/drawable-hdpi/btn_zoom_control.png
new file mode 100644
index 0000000..b9c1c98
Binary files /dev/null and b/res/drawable-hdpi/btn_zoom_control.png differ
diff --git a/res/drawable-hdpi/ic_rotate_camera_facing_back.png b/res/drawable-hdpi/ic_rotate_camera_facing_back.png
new file mode 100644
index 0000000..cca4636
Binary files /dev/null and b/res/drawable-hdpi/ic_rotate_camera_facing_back.png differ
diff --git a/res/drawable-hdpi/ic_rotate_camera_facing_forward.png b/res/drawable-hdpi/ic_rotate_camera_facing_forward.png
new file mode 100644
index 0000000..6def0c7
Binary files /dev/null and b/res/drawable-hdpi/ic_rotate_camera_facing_forward.png differ
diff --git a/res/drawable-hdpi/ic_settings_holo_light.png b/res/drawable-hdpi/ic_settings_holo_light.png
new file mode 100644
index 0000000..24d074c
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_zoom_big.9.png b/res/drawable-hdpi/ic_zoom_big.9.png
new file mode 100644
index 0000000..22425ca
Binary files /dev/null and b/res/drawable-hdpi/ic_zoom_big.9.png differ
diff --git a/res/drawable-hdpi/ic_zoom_in_holo_light.png b/res/drawable-hdpi/ic_zoom_in_holo_light.png
new file mode 100644
index 0000000..df1e925
Binary files /dev/null and b/res/drawable-hdpi/ic_zoom_in_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_zoom_out_holo_light.png b/res/drawable-hdpi/ic_zoom_out_holo_light.png
new file mode 100644
index 0000000..5ce6c42
Binary files /dev/null and b/res/drawable-hdpi/ic_zoom_out_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_zoom_slider.png b/res/drawable-hdpi/ic_zoom_slider.png
new file mode 100644
index 0000000..606fc30
Binary files /dev/null and b/res/drawable-hdpi/ic_zoom_slider.png differ
diff --git a/res/drawable-hdpi/ic_zoom_slider_pressed.png b/res/drawable-hdpi/ic_zoom_slider_pressed.png
new file mode 100644
index 0000000..af55061
Binary files /dev/null and b/res/drawable-hdpi/ic_zoom_slider_pressed.png differ
diff --git a/res/drawable-mdpi/ic_rotate_camera_facing_back.png b/res/drawable-mdpi/ic_rotate_camera_facing_back.png
new file mode 100644
index 0000000..0adc8bd
Binary files /dev/null and b/res/drawable-mdpi/ic_rotate_camera_facing_back.png differ
diff --git a/res/drawable-mdpi/ic_rotate_camera_facing_forward.png b/res/drawable-mdpi/ic_rotate_camera_facing_forward.png
new file mode 100644
index 0000000..bb373af
Binary files /dev/null and b/res/drawable-mdpi/ic_rotate_camera_facing_forward.png differ
diff --git a/res/drawable-mdpi/ic_settings_holo_light.png b/res/drawable-mdpi/ic_settings_holo_light.png
new file mode 100644
index 0000000..dba8990
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_zoom_in_holo_light.png b/res/drawable-mdpi/ic_zoom_in_holo_light.png
new file mode 100644
index 0000000..0d22534
Binary files /dev/null and b/res/drawable-mdpi/ic_zoom_in_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_zoom_out_holo_light.png b/res/drawable-mdpi/ic_zoom_out_holo_light.png
new file mode 100644
index 0000000..9cb7c3d
Binary files /dev/null and b/res/drawable-mdpi/ic_zoom_out_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_zoom_slider.png b/res/drawable-mdpi/ic_zoom_slider.png
new file mode 100644
index 0000000..359dae2
Binary files /dev/null and b/res/drawable-mdpi/ic_zoom_slider.png differ
diff --git a/res/drawable-mdpi/ic_zoom_slider_pressed.png b/res/drawable-mdpi/ic_zoom_slider_pressed.png
new file mode 100644
index 0000000..14acd6a
Binary files /dev/null and b/res/drawable-mdpi/ic_zoom_slider_pressed.png differ
diff --git a/res/drawable-xhdpi/ic_rotate_camera_facing_back.png b/res/drawable-xhdpi/ic_rotate_camera_facing_back.png
new file mode 100644
index 0000000..1caf7e7
Binary files /dev/null and b/res/drawable-xhdpi/ic_rotate_camera_facing_back.png differ
diff --git a/res/drawable-xhdpi/ic_rotate_camera_facing_forward.png b/res/drawable-xhdpi/ic_rotate_camera_facing_forward.png
new file mode 100644
index 0000000..46ce681
Binary files /dev/null and b/res/drawable-xhdpi/ic_rotate_camera_facing_forward.png differ
diff --git a/res/drawable-xhdpi/ic_settings_holo_light.png b/res/drawable-xhdpi/ic_settings_holo_light.png
new file mode 100644
index 0000000..3a5d0ba
Binary files /dev/null and b/res/drawable-xhdpi/ic_settings_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_zoom_in_holo_light.png b/res/drawable-xhdpi/ic_zoom_in_holo_light.png
new file mode 100644
index 0000000..07ba15f
Binary files /dev/null and b/res/drawable-xhdpi/ic_zoom_in_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_zoom_out_holo_light.png b/res/drawable-xhdpi/ic_zoom_out_holo_light.png
new file mode 100644
index 0000000..f6a5d3a
Binary files /dev/null and b/res/drawable-xhdpi/ic_zoom_out_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_zoom_slider.png b/res/drawable-xhdpi/ic_zoom_slider.png
new file mode 100644
index 0000000..441220c
Binary files /dev/null and b/res/drawable-xhdpi/ic_zoom_slider.png differ
diff --git a/res/drawable-xhdpi/ic_zoom_slider_pressed.png b/res/drawable-xhdpi/ic_zoom_slider_pressed.png
new file mode 100644
index 0000000..be1f7ee
Binary files /dev/null and b/res/drawable-xhdpi/ic_zoom_slider_pressed.png differ
diff --git a/res/drawable/btn_zoom_slider.xml b/res/drawable/btn_zoom_slider.xml
new file mode 100644
index 0000000..6ecdf19
--- /dev/null
+++ b/res/drawable/btn_zoom_slider.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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/ic_zoom_slider_pressed" />
+    <item android:drawable="@drawable/ic_zoom_slider" />
+</selector>
+
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
index 342d167..9897dc6 100644
--- a/res/layout-w1024dp/camera_control.xml
+++ b/res/layout-w1024dp/camera_control.xml
@@ -40,6 +40,11 @@
                         android:clickable="true"
                         android:focusable="true"
                         android:background="@drawable/btn_shutter" />
+            <com.android.camera.ui.ZoomPicker
+                    android:id="@+id/zoom_control"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"/>
             <com.android.camera.ui.RotateImageView android:id="@+id/zoom_increment"
                     android:clickable="true"
                     android:layout_width="wrap_content"
diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml
index 6347f3c..ea9c3fe 100644
--- a/res/layout/camera_control.xml
+++ b/res/layout/camera_control.xml
@@ -24,13 +24,13 @@
     <include layout="@layout/review_thumbnail"/>
 
     <com.android.camera.ui.CameraPicker android:id="@+id/camera_picker"
-        android:clickable="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@+id/share_button"
-        android:layout_above="@+id/shutter_button"
-        android:layout_width="36dp"
-        android:layout_height="36dp" />
+            android:clickable="true"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true"
+            android:layout_below="@+id/share_button"
+            android:layout_above="@+id/shutter_button"
+            android:layout_width="36dp"
+            android:layout_height="36dp" />
     <!-- need fixed size of the view since the source icon(HDPI) will be too large for phones -->
 
     <com.android.camera.ShutterButton android:id="@+id/shutter_button"
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml
new file mode 100644
index 0000000..b3d8c09
--- /dev/null
+++ b/res/layout/indicator_bar.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.IndicatorControlContainer xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/indicator_control"
+        android:layout_width="48dp"
+        android:layout_height="match_parent"
+        android:layout_marginTop="6dp"
+        android:layout_marginRight="6dp"
+        android:layout_marginBottom="6dp"
+        android:clickable="true"
+        android:layout_alignParentRight="true">
+    <com.android.camera.ui.IndicatorBar
+            android:id="@+id/indicator_bar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+        <ImageView
+                android:id="@+id/zoom_control_icon"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/btn_zoom_control"
+                android:visibility="gone" />
+        <com.android.camera.ui.RotateImageView
+                android:id="@+id/second_level_indicator_bar_icon"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:src="@drawable/ic_settings_holo_light" />
+    </com.android.camera.ui.IndicatorBar>
+
+    <com.android.camera.ui.ZoomControlBar
+            android:id="@+id/zoom_control"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
+    <com.android.camera.ui.SecondLevelIndicatorBar
+            android:id="@+id/second_level_indicator_bar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
+</com.android.camera.ui.IndicatorControlContainer>
diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml
index 63887ff..1bf621a 100644
--- a/res/layout/preview_frame.xml
+++ b/res/layout/preview_frame.xml
@@ -53,12 +53,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_margin="5dp"
                 android:visibility="gone"/>
-        <com.android.camera.ui.IndicatorBar
-                android:id="@+id/indicator_control"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_centerVertical="true"
-                android:layout_alignParentRight="true"/>
         <include layout="@layout/tap_to_focus_toast"/>
+        <include layout="@layout/indicator_bar" />
     </RelativeLayout>
 </com.android.camera.PreviewFrameLayout>
diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml
index 32154cd..abfd026 100644
--- a/res/layout/preview_frame_video.xml
+++ b/res/layout/preview_frame_video.xml
@@ -49,11 +49,6 @@
                 android:layout_height="match_parent"
                 android:visibility="gone"
                 android:background="@android:color/black" />
-        <com.android.camera.ui.IndicatorBar
-                android:id="@+id/indicator_control"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_centerVertical="true"
-                android:layout_alignParentRight="true"/>
+        <include layout="@layout/indicator_bar" />
     </RelativeLayout>
 </com.android.camera.PreviewFrameLayout>
-- 
cgit v1.1