Overlay camera zoom control with preview frame.

Bug: 3156678
Change-Id: I55b31251f9da1e9dc006cb7a2a3b38425c485bca

18 files changed, 21 insertions, 12 deletions

diff --git a/res/drawable-hdpi/zoompicker_down_normal.9.png b/res/drawable-hdpi/zoompicker_down_normal.9.png
deleted file mode 100644
index 63a6cd5..0000000
--- a/res/drawable-hdpi/zoompicker_down_normal.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/zoompicker_down_normal.png b/res/drawable-hdpi/zoompicker_down_normal.png
new file mode 100644
index 0000000..d1d5ce0
--- /dev/null
+++ b/res/drawable-hdpi/zoompicker_down_normal.png
diff --git a/res/drawable-hdpi/zoompicker_down_pressed.9.png b/res/drawable-hdpi/zoompicker_down_pressed.9.png
deleted file mode 100644
index 317ec35..0000000
--- a/res/drawable-hdpi/zoompicker_down_pressed.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/zoompicker_down_pressed.png b/res/drawable-hdpi/zoompicker_down_pressed.png
new file mode 100644
index 0000000..088d287
--- /dev/null
+++ b/res/drawable-hdpi/zoompicker_down_pressed.png
diff --git a/res/drawable-hdpi/zoompicker_up_normal.9.png b/res/drawable-hdpi/zoompicker_up_normal.9.png
deleted file mode 100644
index b0d30e4..0000000
--- a/res/drawable-hdpi/zoompicker_up_normal.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/zoompicker_up_normal.png b/res/drawable-hdpi/zoompicker_up_normal.png
new file mode 100644
index 0000000..9cded59
--- /dev/null
+++ b/res/drawable-hdpi/zoompicker_up_normal.png
diff --git a/res/drawable-hdpi/zoompicker_up_pressed.9.png b/res/drawable-hdpi/zoompicker_up_pressed.9.png
deleted file mode 100644
index e4af609..0000000
--- a/res/drawable-hdpi/zoompicker_up_pressed.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/zoompicker_up_pressed.png b/res/drawable-hdpi/zoompicker_up_pressed.png
new file mode 100644
index 0000000..320bcaf
--- /dev/null
+++ b/res/drawable-hdpi/zoompicker_up_pressed.png
diff --git a/res/drawable-mdpi/zoompicker_down_normal.9.png b/res/drawable-mdpi/zoompicker_down_normal.9.png
deleted file mode 100755
index f17e8f9..0000000
--- a/res/drawable-mdpi/zoompicker_down_normal.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/zoompicker_down_normal.png b/res/drawable-mdpi/zoompicker_down_normal.png
new file mode 100644
index 0000000..d1d5ce0
--- /dev/null
+++ b/res/drawable-mdpi/zoompicker_down_normal.png
diff --git a/res/drawable-mdpi/zoompicker_down_pressed.9.png b/res/drawable-mdpi/zoompicker_down_pressed.9.png
deleted file mode 100755
index 777bcf5..0000000
--- a/res/drawable-mdpi/zoompicker_down_pressed.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/zoompicker_down_pressed.png b/res/drawable-mdpi/zoompicker_down_pressed.png
new file mode 100644
index 0000000..088d287
--- /dev/null
+++ b/res/drawable-mdpi/zoompicker_down_pressed.png
diff --git a/res/drawable-mdpi/zoompicker_up_normal.9.png b/res/drawable-mdpi/zoompicker_up_normal.9.png
deleted file mode 100755
index dcd26e0..0000000
--- a/res/drawable-mdpi/zoompicker_up_normal.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/zoompicker_up_normal.png b/res/drawable-mdpi/zoompicker_up_normal.png
new file mode 100644
index 0000000..9cded59
--- /dev/null
+++ b/res/drawable-mdpi/zoompicker_up_normal.png
diff --git a/res/drawable-mdpi/zoompicker_up_pressed.9.png b/res/drawable-mdpi/zoompicker_up_pressed.9.png
deleted file mode 100755
index 7dac778..0000000
--- a/res/drawable-mdpi/zoompicker_up_pressed.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/zoompicker_up_pressed.png b/res/drawable-mdpi/zoompicker_up_pressed.png
new file mode 100644
index 0000000..320bcaf
--- /dev/null
+++ b/res/drawable-mdpi/zoompicker_up_pressed.png
diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml
index 18fbcde..38c6200 100644
--- a/res/layout-xlarge/camera_control.xml
+++ b/res/layout-xlarge/camera_control.xml
@@ -19,18 +19,18 @@
         android:id="@+id/control_panel"
         android:layout_height="match_parent"
         android:layout_width="230dp"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="40dp"
         android:layout_marginLeft="-46dp"
-        android:layout_marginBottom="25dp">
+        android:layout_marginBottom="40dp">
 
         <ViewStub android:id="@+id/zoom_stub"
                 android:inflatedId="@+id/zoom_picker"
                 android:layout="@layout/zoom_picker"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentLeft="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="7dp"
+                android:layout_width="45dp"
+                android:layout_height="150dp"
+                android:layout_marginLeft="21dp"
                 android:layout_marginTop="10dp" />
 
         <TextView android:id="@+id/recording_time"
diff --git a/res/layout-xlarge/zoom_picker.xml b/res/layout-xlarge/zoom_picker.xml
index fa373f4..a5ef7ad 100644
--- a/res/layout-xlarge/zoom_picker.xml
+++ b/res/layout-xlarge/zoom_picker.xml
@@ -18,26 +18,35 @@
 -->
 
 <com.android.camera.ui.ZoomPicker xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:gravity="center"
+        android:layout_width="45dp"
+        android:layout_height="150dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:background="@drawable/mode_switch_bg_v2">
 
     <TextView android:id="@+id/zoom_ratio"
+        android:gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="20dp"
         android:singleLine="true"
         android:textColor="@android:color/white"
-        android:textSize="24dp" />
+        android:textSize="16dp" />
 
     <Button android:id="@+id/increment"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
         android:background="@drawable/btn_zoom_picker_up" />
 
     <Button android:id="@+id/decrement"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
         android:background="@drawable/btn_zoom_picker_down" />
 </com.android.camera.ui.ZoomPicker>