summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-11-29 17:09:19 +0800
committerHung-ying Tyan <tyanh@google.com>2010-11-29 17:09:19 +0800
commit8969b9f19f41c27abb942a35ee24dfcba2938a78 (patch)
treee3a2140c1fef83d05c3592f451f804b0d24c9a96 /res
parentee1ce9805a4dba409fbf05457cac7f5991b571c5 (diff)
downloadpackages_apps_LegacyCamera-8969b9f19f41c27abb942a35ee24dfcba2938a78.zip
packages_apps_LegacyCamera-8969b9f19f41c27abb942a35ee24dfcba2938a78.tar.gz
packages_apps_LegacyCamera-8969b9f19f41c27abb942a35ee24dfcba2938a78.tar.bz2
Make camcorder recording time appear again.
Last CL introduces a bug making it disappear. Change-Id: I3ed4f1777d73f130aad3c4c7a20fedf160a2c86b
Diffstat (limited to 'res')
-rw-r--r--res/layout-xlarge/camera_control.xml10
1 files changed, 7 insertions, 3 deletions
diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml
index 132bcea..0476763 100644
--- a/res/layout-xlarge/camera_control.xml
+++ b/res/layout-xlarge/camera_control.xml
@@ -18,10 +18,14 @@
xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
android:id="@+id/control_panel"
android:layout_height="match_parent"
- android:layout_width="wrap_content"
+ android:layout_width="300dp"
android:layout_alignParentRight="true"
android:layout_marginTop="40dp"
android:layout_marginBottom="40dp">
+ <!-- The width is determined by IndicatorWheel so we should set
+ layout_width as wrap_contant instead of hardcoding the width
+ but somehow doing so makes the control panel occupy the whole
+ screen width. Framework bug? -->
<ViewStub android:id="@+id/zoom_stub"
android:inflatedId="@+id/zoom_picker"
@@ -52,9 +56,9 @@
android:visibility="gone" />
<com.android.camera.ui.IndicatorWheel android:id="@+id/indicator_wheel"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerInParent="true"
+ android:layout_centerVertical="true"
android:layout_alignParentRight="true">
<com.android.camera.ShutterButton android:id="@+id/shutter_button"
android:layout_height="wrap_content"