Merge "Fix the zoom control bar UI on phone." into ics-factoryrom

32 files changed, 63 insertions, 1 deletions

diff --git a/res/drawable-hdpi/ic_zoom_big.9.png b/res/drawable-hdpi/ic_zoom_big.9.png
index cc40dec..8e6380e 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_big_dark.9.png b/res/drawable-hdpi/ic_zoom_big_dark.9.png
new file mode 100644
index 0000000..340254b
--- /dev/null
+++ b/res/drawable-hdpi/ic_zoom_big_dark.9.png
diff --git a/res/drawable-hdpi/ic_zoom_in_holo_dark.png b/res/drawable-hdpi/ic_zoom_in_holo_dark.png
new file mode 100644
index 0000000..89b5f15
--- /dev/null
+++ b/res/drawable-hdpi/ic_zoom_in_holo_dark.png
diff --git a/res/drawable-hdpi/ic_zoom_in_holo_light.png b/res/drawable-hdpi/ic_zoom_in_holo_light.png
index 89b5f15..b96da3b 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_dark.png b/res/drawable-hdpi/ic_zoom_out_holo_dark.png
new file mode 100644
index 0000000..f4a2589
--- /dev/null
+++ b/res/drawable-hdpi/ic_zoom_out_holo_dark.png
diff --git a/res/drawable-hdpi/ic_zoom_out_holo_light.png b/res/drawable-hdpi/ic_zoom_out_holo_light.png
index f4a2589..2f6a7b5 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-mdpi/ic_zoom_big.9.png b/res/drawable-mdpi/ic_zoom_big.9.png
index 9c2019c..e551fd0 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_big_dark.9.png b/res/drawable-mdpi/ic_zoom_big_dark.9.png
new file mode 100644
index 0000000..4c12ae5
--- /dev/null
+++ b/res/drawable-mdpi/ic_zoom_big_dark.9.png
diff --git a/res/drawable-mdpi/ic_zoom_in_holo_dark.png b/res/drawable-mdpi/ic_zoom_in_holo_dark.png
new file mode 100644
index 0000000..4f33278
--- /dev/null
+++ b/res/drawable-mdpi/ic_zoom_in_holo_dark.png
diff --git a/res/drawable-mdpi/ic_zoom_in_holo_light.png b/res/drawable-mdpi/ic_zoom_in_holo_light.png
index 4f33278..fb840e1 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_dark.png b/res/drawable-mdpi/ic_zoom_out_holo_dark.png
new file mode 100644
index 0000000..2631894
--- /dev/null
+++ b/res/drawable-mdpi/ic_zoom_out_holo_dark.png
diff --git a/res/drawable-mdpi/ic_zoom_out_holo_light.png b/res/drawable-mdpi/ic_zoom_out_holo_light.png
index 2631894..55bc997 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-w1024dp-hdpi/ic_zoom_in_holo_dark.png b/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_dark.png
new file mode 100644
index 0000000..99d5ef4
--- /dev/null
+++ b/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_dark.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
index 99d5ef4..42c0a75 100644
--- a/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_light.png
+++ b/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_dark.png b/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_dark.png
new file mode 100644
index 0000000..5fa4c95
--- /dev/null
+++ b/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_dark.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
index 5fa4c95..5a8eac8 100644
--- a/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_light.png
+++ b/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_dark.png b/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_dark.png
new file mode 100644
index 0000000..fd35207
--- /dev/null
+++ b/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_dark.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
index fd35207..3d55439 100644
--- a/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_light.png
+++ b/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_dark.png b/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_dark.png
new file mode 100644
index 0000000..e282872
--- /dev/null
+++ b/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_dark.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
index e282872..1a5475b 100644
--- a/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_light.png
+++ b/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_dark.png b/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_dark.png
new file mode 100644
index 0000000..34064d7
--- /dev/null
+++ b/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_dark.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
index 34064d7..6297de4 100644
--- a/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_light.png
+++ 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 1e27378..48b9e24 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_big_dark.9.png b/res/drawable-xhdpi/ic_zoom_big_dark.9.png
new file mode 100644
index 0000000..b33b546
--- /dev/null
+++ b/res/drawable-xhdpi/ic_zoom_big_dark.9.png
diff --git a/res/drawable-xhdpi/ic_zoom_in_holo_dark.png b/res/drawable-xhdpi/ic_zoom_in_holo_dark.png
new file mode 100644
index 0000000..78178cd
--- /dev/null
+++ b/res/drawable-xhdpi/ic_zoom_in_holo_dark.png
diff --git a/res/drawable-xhdpi/ic_zoom_in_holo_light.png b/res/drawable-xhdpi/ic_zoom_in_holo_light.png
index 78178cd..e950b13 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_dark.png b/res/drawable-xhdpi/ic_zoom_out_holo_dark.png
new file mode 100644
index 0000000..426aac8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_zoom_out_holo_dark.png
diff --git a/res/drawable-xhdpi/ic_zoom_out_holo_light.png b/res/drawable-xhdpi/ic_zoom_out_holo_light.png
index 426aac8..c06ca66 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/ic_zoom_in.xml b/res/drawable/ic_zoom_in.xml
new file mode 100644
index 0000000..7ba87ae
--- /dev/null
+++ b/res/drawable/ic_zoom_in.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_activated="true" android:drawable="@drawable/ic_zoom_in_holo_light" />
+    <item android:drawable="@drawable/ic_zoom_in_holo_dark" />
+</selector>
+
diff --git a/res/drawable/ic_zoom_out.xml b/res/drawable/ic_zoom_out.xml
new file mode 100644
index 0000000..1d46cbc
--- /dev/null
+++ b/res/drawable/ic_zoom_out.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_activated="true" android:drawable="@drawable/ic_zoom_out_holo_light" />
+    <item android:drawable="@drawable/ic_zoom_out_holo_dark" />
+</selector>
+
diff --git a/res/drawable/zoom_slider_bar.xml b/res/drawable/zoom_slider_bar.xml
new file mode 100644
index 0000000..234fd0f
--- /dev/null
+++ b/res/drawable/zoom_slider_bar.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_activated="true" android:drawable="@drawable/ic_zoom_big" />
+    <item android:drawable="@drawable/ic_zoom_big_dark" />
+</selector>
+
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml
index c39fb93..11276e3 100644
--- a/res/layout/indicator_bar.xml
+++ b/res/layout/indicator_bar.xml
@@ -49,7 +49,6 @@
                     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.RotateImageView
                     android:id="@+id/second_level_indicator_bar_icon"