diff options
| author | Angus Kong <shkong@google.com> | 2011-10-05 13:01:44 +0800 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2011-10-05 18:06:36 +0800 |
| commit | e4d0a72cbc4633497c393019ff2c57e63b1039b9 (patch) | |
| tree | 7f0c3fe67d4ea794bcfaa46e7b7f0c91cf7b0b03 /res/layout-w1024dp | |
| parent | ff1c641693cf537703fef3949ccf15898c3ad5d0 (diff) | |
| download | LegacyCamera-e4d0a72cbc4633497c393019ff2c57e63b1039b9.zip LegacyCamera-e4d0a72cbc4633497c393019ff2c57e63b1039b9.tar.gz LegacyCamera-e4d0a72cbc4633497c393019ff2c57e63b1039b9.tar.bz2 | |
Add time lapse label for Phone UI.
1. The behavior on tablet UI and phone UI now is the same.
2. The recording time and time lapse label now always stay on the top-left corner (even when in
portrait).
bug:5394916
Change-Id: Ifa5013748dbdda3a6c0083569ec3c565b4c687eb
Diffstat (limited to 'res/layout-w1024dp')
| -rw-r--r-- | res/layout-w1024dp/preview_frame_video.xml | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml index a125187..8b7cb2b 100644 --- a/res/layout-w1024dp/preview_frame_video.xml +++ b/res/layout-w1024dp/preview_frame_video.xml @@ -28,26 +28,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> <com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="20dp" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true"> + style="@style/ViewfinderLableLayout"> - <LinearLayout android:id="@+id/labels" - android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <TextView android:id="@+id/time_lapse_label" - android:text="@string/time_lapse_title" - style="@style/OnViewfinderLabel" - android:visibility="gone" /> - <TextView android:id="@+id/recording_time" - style="@style/OnViewfinderLabel" - android:gravity="center" - android:drawableLeft="@drawable/ic_recording_indicator_small" - android:drawablePadding="5dp" - android:visibility="gone"/> - </LinearLayout> + <include layout="@layout/viewfinder_labels_video" android:id="@+id/labels_w1024" /> </com.android.camera.ui.RotateLayout> <ImageView android:id="@+id/review_image" android:layout_width="match_parent" |