Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b am: bc58c1f129

am: b8ac55aec0 Change-Id: I1594f80c15fd663c706164384c463633eedea264
2019-05-17 21:57:36 -07:00
parent 7a48111584 b8ac55aec0
commit 9842725a23
3 changed files with 3 additions and 8 deletions
--- a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
@@ -45,7 +45,8 @@

            <FrameLayout
                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:clipChildren="true">
                <TextureView
                    android:id="@+id/preview_view"
                    android:layout_width="match_parent"