summaryrefslogtreecommitdiffstats
path: root/res/layout-w1024dp
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2011-08-17 16:32:59 +0800
committerChung-yih Wang <cywang@google.com>2011-08-17 16:32:59 +0800
commitb5f9aaec7e3376e35681befd4a3376e36dd3237a (patch)
tree10d749b5f021c6343a2ea34820db8cc16507b2f7 /res/layout-w1024dp
parent74fe6dc0918c8129210cdcf1816a6a052d737997 (diff)
downloadLegacyCamera-b5f9aaec7e3376e35681befd4a3376e36dd3237a.zip
LegacyCamera-b5f9aaec7e3376e35681befd4a3376e36dd3237a.tar.gz
LegacyCamera-b5f9aaec7e3376e35681befd4a3376e36dd3237a.tar.bz2
Fix the indicator wheel look.
Since we had a invisible zoom picker control inside the indicator wheel. The look of the indicator wheel was not correct. The change fixes the look by moving out the ZoomPicker. Change-Id: If947918f5d67e9224de44a48e7f1c28dba3e9f08
Diffstat (limited to 'res/layout-w1024dp')
-rw-r--r--res/layout-w1024dp/camera_control.xml11
1 files changed, 6 insertions, 5 deletions
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
index 9897dc6..8008adb 100644
--- a/res/layout-w1024dp/camera_control.xml
+++ b/res/layout-w1024dp/camera_control.xml
@@ -40,11 +40,6 @@
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"
@@ -65,6 +60,12 @@
android:layout_height="wrap_content" />
</com.android.camera.ui.IndicatorWheel>
+ <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>