Merge "New zoom control for phone." into ics-factoryrom

18 files changed, 4 insertions, 11 deletions

diff --git a/res/drawable-hdpi/ic_zoom_big.9.png b/res/drawable-hdpi/ic_zoom_big.9.png
index b960a50..cc40dec 100644
--- a/res/drawable-hdpi/ic_zoom_big.9.png
+++ b/res/drawable-hdpi/ic_zoom_big.9.png
diff --git a/res/drawable-hdpi/ic_zoom_in_holo_light.png b/res/drawable-hdpi/ic_zoom_in_holo_light.png
index df1e925..89b5f15 100644
--- a/res/drawable-hdpi/ic_zoom_in_holo_light.png
+++ b/res/drawable-hdpi/ic_zoom_in_holo_light.png
diff --git a/res/drawable-hdpi/ic_zoom_out_holo_light.png b/res/drawable-hdpi/ic_zoom_out_holo_light.png
index 5ce6c42..f4a2589 100644
--- a/res/drawable-hdpi/ic_zoom_out_holo_light.png
+++ b/res/drawable-hdpi/ic_zoom_out_holo_light.png
diff --git a/res/drawable-hdpi/ic_zoom_slider.png b/res/drawable-hdpi/ic_zoom_slider.png
index 606fc30..8427e4d 100644
--- a/res/drawable-hdpi/ic_zoom_slider.png
+++ b/res/drawable-hdpi/ic_zoom_slider.png
diff --git a/res/drawable-mdpi/ic_zoom_big.9.png b/res/drawable-mdpi/ic_zoom_big.9.png
index 35d4683..9c2019c 100644
--- a/res/drawable-mdpi/ic_zoom_big.9.png
+++ b/res/drawable-mdpi/ic_zoom_big.9.png
diff --git a/res/drawable-mdpi/ic_zoom_in_holo_light.png b/res/drawable-mdpi/ic_zoom_in_holo_light.png
index 0d22534..4f33278 100644
--- a/res/drawable-mdpi/ic_zoom_in_holo_light.png
+++ b/res/drawable-mdpi/ic_zoom_in_holo_light.png
diff --git a/res/drawable-mdpi/ic_zoom_out_holo_light.png b/res/drawable-mdpi/ic_zoom_out_holo_light.png
index 9cb7c3d..2631894 100644
--- a/res/drawable-mdpi/ic_zoom_out_holo_light.png
+++ b/res/drawable-mdpi/ic_zoom_out_holo_light.png
diff --git a/res/drawable-mdpi/ic_zoom_slider.png b/res/drawable-mdpi/ic_zoom_slider.png
index 359dae2..16aacf1 100644
--- a/res/drawable-mdpi/ic_zoom_slider.png
+++ b/res/drawable-mdpi/ic_zoom_slider.png
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_light.png b/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_light.png
new file mode 100644
index 0000000..99d5ef4
--- /dev/null
+++ b/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_light.png b/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_light.png
new file mode 100644
index 0000000..5fa4c95
--- /dev/null
+++ b/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_light.png b/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_light.png
new file mode 100644
index 0000000..fd35207
--- /dev/null
+++ b/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_light.png b/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_light.png
new file mode 100644
index 0000000..e282872
--- /dev/null
+++ b/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_light.png
new file mode 100644
index 0000000..34064d7
--- /dev/null
+++ b/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_light.png
diff --git a/res/drawable-xhdpi/ic_zoom_big.9.png b/res/drawable-xhdpi/ic_zoom_big.9.png
index 42fbb32..1e27378 100644
--- a/res/drawable-xhdpi/ic_zoom_big.9.png
+++ b/res/drawable-xhdpi/ic_zoom_big.9.png
diff --git a/res/drawable-xhdpi/ic_zoom_in_holo_light.png b/res/drawable-xhdpi/ic_zoom_in_holo_light.png
index 07ba15f..78178cd 100644
--- a/res/drawable-xhdpi/ic_zoom_in_holo_light.png
+++ b/res/drawable-xhdpi/ic_zoom_in_holo_light.png
diff --git a/res/drawable-xhdpi/ic_zoom_out_holo_light.png b/res/drawable-xhdpi/ic_zoom_out_holo_light.png
index f6a5d3a..426aac8 100644
--- a/res/drawable-xhdpi/ic_zoom_out_holo_light.png
+++ b/res/drawable-xhdpi/ic_zoom_out_holo_light.png
diff --git a/res/drawable-xhdpi/ic_zoom_slider.png b/res/drawable-xhdpi/ic_zoom_slider.png
index 441220c..9501f92 100644
--- a/res/drawable-xhdpi/ic_zoom_slider.png
+++ b/res/drawable-xhdpi/ic_zoom_slider.png
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml
index 0422e68..c39fb93 100644
--- a/res/layout/indicator_bar.xml
+++ b/res/layout/indicator_bar.xml
@@ -45,12 +45,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_centerHorizontal="true">
-            <com.android.camera.ui.ColorFilterImageView
-                    android:id="@+id/zoom_control_icon"
+            <com.android.camera.ui.ZoomControlBar
+                    android:id="@+id/zoom_control"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="@drawable/btn_zoom_control"
+                    android:layout_height="match_parent"
+                    android:layout_centerHorizontal="true"
                     android:visibility="gone" />
             <com.android.camera.ui.RotateImageView
                     android:id="@+id/second_level_indicator_bar_icon"
@@ -60,12 +59,6 @@
                     android:src="@drawable/ic_settings_holo_light" />
         </com.android.camera.ui.IndicatorControlBar>
 
-        <com.android.camera.ui.ZoomControlBar
-                android:id="@+id/zoom_control"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_centerHorizontal="true"
-                android:visibility="gone" />
         <com.android.camera.ui.SecondLevelIndicatorControlBar
                 android:id="@+id/second_level_indicator_bar"
                 android:padding="8dp"