summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-11-09 22:00:27 +0800
committerWu-cheng Li <wuchengli@google.com>2010-11-18 14:03:25 +0800
commit9cfab4bc18b8d9d905263c687e19c06df885dca7 (patch)
treea954f01a254f3e0d9334ad29d8534aca94e98ad9 /res
parent16eb20a2ee0aed297d41b82894ade3b57536d543 (diff)
downloadLegacyCamera-9cfab4bc18b8d9d905263c687e19c06df885dca7.tar.gz
LegacyCamera-9cfab4bc18b8d9d905263c687e19c06df885dca7.tar.bz2
LegacyCamera-9cfab4bc18b8d9d905263c687e19c06df885dca7.zip
Rotate the postview to correct orientation in video attach mode.
Manual merge from gingerbread. bug:3208306 Change-Id: Ib7fb0a960c862527324adefd419e74224f59bc30
Diffstat (limited to 'res')
-rw-r--r--res/layout-xlarge/attach_camera_control.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/res/layout-xlarge/attach_camera_control.xml b/res/layout-xlarge/attach_camera_control.xml
index b33085b7..c84e7a6a 100644
--- a/res/layout-xlarge/attach_camera_control.xml
+++ b/res/layout-xlarge/attach_camera_control.xml
@@ -18,11 +18,22 @@
xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
android:id="@+id/control_bar"
android:layout_height="match_parent"
- android:layout_width="90dp"
+ android:layout_width="120dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp">
+ <TextView android:id="@+id/recording_time"
+ style="@style/RecordingTime"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="90dp"
+ android:drawablePadding="8dp"
+ android:drawableLeft="@drawable/ic_recording_indicator"
+ android:visibility="gone" />
+
<LinearLayout android:orientation="vertical"
android:gravity="top|center_horizontal"
android:layout_alignParentTop="true"
@@ -56,6 +67,7 @@
android:text="@string/review_play" />
</LinearLayout>
</LinearLayout>
+
<com.android.camera.ShutterButton android:id="@+id/shutter_button"
android:layout_centerInParent="true"
android:layout_centerHorizontal="true"