diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-05-31 16:00:50 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-06-27 19:12:24 +0800 |
| commit | 4a045a8e858706f56a6ffb5187960768f861f007 (patch) | |
| tree | 6f7c3b36891ba032eec5581b09e4942548ff54f3 /res/layout-w1024dp | |
| parent | 3b096a491432b9904ad758fa11a6b894a03ad6ec (diff) | |
| download | LegacyCamera-4a045a8e858706f56a6ffb5187960768f861f007.zip LegacyCamera-4a045a8e858706f56a6ffb5187960768f861f007.tar.gz LegacyCamera-4a045a8e858706f56a6ffb5187960768f861f007.tar.bz2 | |
Add camcorder zoom.
bug:2644213
Change-Id: I669966e4fd54c76d19660efa6f1700a86b4d6c07
Diffstat (limited to 'res/layout-w1024dp')
| -rw-r--r-- | res/layout-w1024dp/preview_frame_video.xml | 33 | ||||
| -rw-r--r-- | res/layout-w1024dp/zoom_picker.xml | 4 |
2 files changed, 21 insertions, 16 deletions
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml index 9ae22bb..f3ef82a 100644 --- a/res/layout-w1024dp/preview_frame_video.xml +++ b/res/layout-w1024dp/preview_frame_video.xml @@ -26,22 +26,29 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> <include layout="@layout/review_thumbnail"/> - <TextView android:id="@+id/recording_time" - style="@style/OnViewfinderLabel" + <LinearLayout android:id="@+id/labels" + android:layout_width="wrap_content" + android:layout_height="wrap_content" 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" + android:layout_alignParentRight="true"> + <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> + <TextView android:id="@+id/zoom_ratio" style="@style/OnViewfinderLabel" - android:layout_toLeftOf="@id/recording_time" - android:layout_below="@id/review_control" + android:layout_alignParentRight="true" + android:layout_below="@id/labels" android:layout_alignWithParentIfMissing="true" - android:visibility="gone"/> + android:visibility="invisible"/> + <include layout="@layout/review_control"/> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout-w1024dp/zoom_picker.xml b/res/layout-w1024dp/zoom_picker.xml index e4a2808..6848d59 100644 --- a/res/layout-w1024dp/zoom_picker.xml +++ b/res/layout-w1024dp/zoom_picker.xml @@ -24,18 +24,16 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_alignParentRight="true" - android:enabled="false"> + android:visibility="gone"> <Button android:id="@+id/decrement" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:enabled="false" android:background="@drawable/btn_zoom_out" /> <Button android:id="@+id/increment" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/zoom_picker_distance" - android:enabled="false" android:background="@drawable/btn_zoom_in" /> </com.android.camera.ui.ZoomPicker> |