Add ZoomControlWheel.

bug:5083780
Change-Id: I1a18c247d638edd3f8e5e0588170b6820f280f96

18 files changed, 5 insertions, 60 deletions

diff --git a/res/drawable-hdpi/button_zoom_in_disabled_holo.png b/res/drawable-hdpi/button_zoom_in_disabled_holo.png
deleted file mode 100644
index 7688afe..0000000
--- a/res/drawable-hdpi/button_zoom_in_disabled_holo.png
+++ /dev/null
diff --git a/res/drawable-hdpi/button_zoom_in_holo.png b/res/drawable-hdpi/button_zoom_in_holo.png
deleted file mode 100644
index dde4f48..0000000
--- a/res/drawable-hdpi/button_zoom_in_holo.png
+++ /dev/null
diff --git a/res/drawable-hdpi/button_zoom_in_pressed_holo.png b/res/drawable-hdpi/button_zoom_in_pressed_holo.png
deleted file mode 100644
index d9f9f12..0000000
--- a/res/drawable-hdpi/button_zoom_in_pressed_holo.png
+++ /dev/null
diff --git a/res/drawable-hdpi/button_zoom_out_disabled_holo.png b/res/drawable-hdpi/button_zoom_out_disabled_holo.png
deleted file mode 100644
index 832319e..0000000
--- a/res/drawable-hdpi/button_zoom_out_disabled_holo.png
+++ /dev/null
diff --git a/res/drawable-hdpi/button_zoom_out_holo.png b/res/drawable-hdpi/button_zoom_out_holo.png
deleted file mode 100644
index 484542e..0000000
--- a/res/drawable-hdpi/button_zoom_out_holo.png
+++ /dev/null
diff --git a/res/drawable-hdpi/button_zoom_out_pressed_holo.png b/res/drawable-hdpi/button_zoom_out_pressed_holo.png
deleted file mode 100644
index d2a3e59..0000000
--- a/res/drawable-hdpi/button_zoom_out_pressed_holo.png
+++ /dev/null
diff --git a/res/drawable-mdpi/button_zoom_in_disabled_holo.png b/res/drawable-mdpi/button_zoom_in_disabled_holo.png
deleted file mode 100644
index 7688afe..0000000
--- a/res/drawable-mdpi/button_zoom_in_disabled_holo.png
+++ /dev/null
diff --git a/res/drawable-mdpi/button_zoom_in_holo.png b/res/drawable-mdpi/button_zoom_in_holo.png
deleted file mode 100644
index dde4f48..0000000
--- a/res/drawable-mdpi/button_zoom_in_holo.png
+++ /dev/null
diff --git a/res/drawable-mdpi/button_zoom_in_pressed_holo.png b/res/drawable-mdpi/button_zoom_in_pressed_holo.png
deleted file mode 100644
index d9f9f12..0000000
--- a/res/drawable-mdpi/button_zoom_in_pressed_holo.png
+++ /dev/null
diff --git a/res/drawable-mdpi/button_zoom_out_disabled_holo.png b/res/drawable-mdpi/button_zoom_out_disabled_holo.png
deleted file mode 100644
index 832319e..0000000
--- a/res/drawable-mdpi/button_zoom_out_disabled_holo.png
+++ /dev/null
diff --git a/res/drawable-mdpi/button_zoom_out_holo.png b/res/drawable-mdpi/button_zoom_out_holo.png
deleted file mode 100644
index 484542e..0000000
--- a/res/drawable-mdpi/button_zoom_out_holo.png
+++ /dev/null
diff --git a/res/drawable-mdpi/button_zoom_out_pressed_holo.png b/res/drawable-mdpi/button_zoom_out_pressed_holo.png
deleted file mode 100644
index d2a3e59..0000000
--- a/res/drawable-mdpi/button_zoom_out_pressed_holo.png
+++ /dev/null
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_holo_light.png b/res/drawable-w1024dp-hdpi/ic_zoom_holo_light.png
new file mode 100644
index 0000000..b90d1ac
--- /dev/null
+++ b/res/drawable-w1024dp-hdpi/ic_zoom_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/btn_zoom_in.xml b/res/drawable-w1024dp-mdpi/btn_zoom_in.xml
deleted file mode 100644
index d798b5a..0000000
--- a/res/drawable-w1024dp-mdpi/btn_zoom_in.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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-w1024dp-mdpi/btn_zoom_out.xml b/res/drawable-w1024dp-mdpi/btn_zoom_out.xml
deleted file mode 100644
index 925327d..0000000
--- a/res/drawable-w1024dp-mdpi/btn_zoom_out.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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-w1024dp-mdpi/ic_zoom_holo_light.png b/res/drawable-w1024dp-mdpi/ic_zoom_holo_light.png
new file mode 100644
index 0000000..0917b07
--- /dev/null
+++ b/res/drawable-w1024dp-mdpi/ic_zoom_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_zoom_holo_light.png
new file mode 100644
index 0000000..572294e
--- /dev/null
+++ b/res/drawable-w1024dp-xhdpi/ic_zoom_holo_light.png
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
index 23bad2b..0ba7d6c 100644
--- a/res/layout-w1024dp/camera_control.xml
+++ b/res/layout-w1024dp/camera_control.xml
@@ -43,26 +43,13 @@
             <com.android.camera.ui.IndicatorControlWheel android:id="@+id/indicator_control_wheel"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
-                <com.android.camera.ui.RotateImageView android:id="@+id/zoom_increment"
-                        android:clickable="true"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/btn_zoom_in"
-                        android:visibility="gone" />
-                <com.android.camera.ui.RotateImageView android:id="@+id/zoom_decrement"
-                        android:clickable="true"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/btn_zoom_out"
-                        android:visibility="gone" />
             </com.android.camera.ui.IndicatorControlWheel>
+            <com.android.camera.ui.ZoomControlWheel
+                    android:id="@+id/zoom_control"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="gone" />
         </com.android.camera.ui.IndicatorControlWheelContainer>
-        <com.android.camera.ui.ZoomPicker
-                android:id="@+id/zoom_control"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"/>
-
         <include layout="@layout/mode_picker"/>
 </com.android.camera.ui.ControlPanelLayout>