summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/photo_module.xml12
-rw-r--r--res/layout/video_module.xml12
2 files changed, 18 insertions, 6 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index f5525b832..b0bca3c97 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -24,10 +24,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center">
- <TextureView
- android:id="@+id/preview_content"
+ <!-- Wrap a frame layout around texture view so that when scaled, texture
+ view will not draw outside its unscaled bounds -->
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent">
+ <TextureView
+ android:id="@+id/preview_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </FrameLayout>
<View
android:id="@+id/flash_overlay"
android:layout_width="match_parent"
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 0f4857965..b4444e7f0 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -17,10 +17,16 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent">
- <TextureView
- android:id="@+id/preview_content"
+ <!-- Wrap a frame layout around texture view so that when scaled, texture
+ view will not draw outside its unscaled bounds -->
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent">
+ <TextureView
+ android:id="@+id/preview_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </FrameLayout>
<View
android:id="@+id/flash_overlay"
android:layout_width="match_parent"