diff options
| author | Doris Liu <tianliu@google.com> | 2014-02-28 10:35:45 -0800 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2014-03-05 21:25:39 -0800 |
| commit | d6487c911dd1f5095723db2a1e9aaa609ebc5ee1 (patch) | |
| tree | 1cc10c98f75474299d4df68a9f3c48fb822d1800 /res/layout | |
| parent | 1b98b97f458e4a2146384b840987e15a7d0dd4e5 (diff) | |
| download | android_packages_apps_Camera2-d6487c911dd1f5095723db2a1e9aaa609ebc5ee1.tar.gz android_packages_apps_Camera2-d6487c911dd1f5095723db2a1e9aaa609ebc5ee1.tar.bz2 android_packages_apps_Camera2-d6487c911dd1f5095723db2a1e9aaa609ebc5ee1.zip | |
Add video recording hint to discourage vertical videos
Bug: 8654023
Change-Id: I336f9e6af2393985e223a44a8e877e2878add76d
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/video_module.xml | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml index 4f249dbd6..90decf2c2 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -17,22 +17,35 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="match_parent" android:layout_width="match_parent"> - <com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect" - style="@style/ViewfinderLabelLayout"> - <include layout="@layout/viewfinder_labels_video" android:id="@+id/labels" /> + + <com.android.camera.ui.RotateLayout + android:id="@+id/recording_time_rect" + style="@style/ViewfinderLabelLayout"> + + <include + layout="@layout/viewfinder_labels_video" + android:id="@+id/labels" /> </com.android.camera.ui.RotateLayout> - <ImageView android:id="@+id/review_image" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:scaleType="fitStart" - android:visibility="gone" - android:background="@android:color/black"/> + + <com.android.camera.widget.VideoRecordingHints + android:id="@+id/video_shooting_hints" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <ImageView + android:id="@+id/review_image" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:scaleType="fitStart" + android:visibility="gone" + android:background="@android:color/black" /> + <ImageView - android:id="@+id/btn_play" - style="@style/ReviewControlIcon" - android:layout_centerInParent="true" - android:src="@drawable/ic_gallery_play_big" - android:scaleType="center" - android:visibility="gone" - android:onClick="onReviewPlayClicked"/> + android:id="@+id/btn_play" + style="@style/ReviewControlIcon" + android:layout_centerInParent="true" + android:src="@drawable/ic_gallery_play_big" + android:scaleType="center" + android:visibility="gone" + android:onClick="onReviewPlayClicked" /> </merge> |