summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-12-22 22:55:59 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-22 22:55:59 -0800
commit31595669bfedc8a30872a8e1394b83b2d50662ca (patch)
treeb1132911f8a317b81c0487273d7108ec63fc145a /res/layout
parent23bd2ab2d6f5fd5039e18eba893aa7670b3d871c (diff)
parent01847b7c4bac4432df92c24e173bada7193bfe1a (diff)
downloadandroid_packages_apps_Snap-31595669bfedc8a30872a8e1394b83b2d50662ca.tar.gz
android_packages_apps_Snap-31595669bfedc8a30872a8e1394b83b2d50662ca.tar.bz2
android_packages_apps_Snap-31595669bfedc8a30872a8e1394b83b2d50662ca.zip
Merge "SnapdragonCamera: Modify video preview UI" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res/layout')
-rwxr-xr-x[-rw-r--r--]res/layout/video_module.xml31
1 files changed, 19 insertions, 12 deletions
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 2456caf82..56f585787 100644..100755
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -77,19 +77,26 @@
android:id="@+id/labels" />
</LinearLayout>
</com.android.camera.ui.RotateLayout>
- <ImageView android:id="@+id/review_image"
- android:layout_height="match_parent"
+ <FrameLayout
android:layout_width="match_parent"
- 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:layout_height="match_parent">
+ <ImageView android:id="@+id/review_image"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ 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:layout_gravity="center"
+ android:onClick="onReviewPlayClicked"/>
+ </FrameLayout>
+
<include layout="@layout/camera_controls"
android:layout_gravity="center"
style="@style/CameraControls"/>