summaryrefslogtreecommitdiffstats
path: root/res/layout-xlarge
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-12-20 15:16:07 +0800
committerWu-cheng Li <wuchengli@google.com>2010-12-20 16:11:03 +0800
commit1afe2a1ff266f1ccd7fccf2c37e97d2136384896 (patch)
tree86d77a97a768831986a6f10d05cb7f5f5d14f28f /res/layout-xlarge
parent8303435a2466803e05dd99c60cdb2de074b79162 (diff)
downloadLegacyCamera-1afe2a1ff266f1ccd7fccf2c37e97d2136384896.zip
LegacyCamera-1afe2a1ff266f1ccd7fccf2c37e97d2136384896.tar.gz
LegacyCamera-1afe2a1ff266f1ccd7fccf2c37e97d2136384896.tar.bz2
Avoid time-lapse recording label overlapping on review control.
1. Put time-lapse label under review control. 2. Hide review control during recording. 3. Hide time-lapse UI during review. bug:3287027 Change-Id: If1695e5b1b0c5d222c8ae65ac721a4bb2e05a131
Diffstat (limited to 'res/layout-xlarge')
-rw-r--r--res/layout-xlarge/preview_frame_video.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/res/layout-xlarge/preview_frame_video.xml b/res/layout-xlarge/preview_frame_video.xml
index 1555f64..33b9a19 100644
--- a/res/layout-xlarge/preview_frame_video.xml
+++ b/res/layout-xlarge/preview_frame_video.xml
@@ -38,19 +38,20 @@
<include layout="@layout/review_thumbnail"/>
<TextView android:id="@+id/recording_time"
style="@style/OnViewfinderLabel"
- android:layout_below="@+id/review_control"
+ android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:gravity="center"
android:drawableLeft="@drawable/ic_recording_indicator_small"
android:drawablePadding="5dp"
android:visibility="gone"/>
+ <include layout="@layout/review_control"/>
<TextView android:id="@+id/time_lapse_label"
android:text="@string/time_lapse_title"
style="@style/OnViewfinderLabel"
- android:layout_toLeftOf="@+id/recording_time"
+ android:layout_toLeftOf="@id/recording_time"
+ android:layout_below="@id/review_control"
android:layout_alignWithParentIfMissing="true"
android:visibility="gone"/>
- <include layout="@layout/review_control"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"