From a10d3cfc7895fbad125bf7f28efd58adc7386a9d Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Fri, 17 May 2019 12:56:07 -0700
Subject: [PATCH 1/2] Fix view overlap in wifi dpp enrollment.

Fixes: 132813855
Test: visual
Change-Id: I5415b8edaf1ce5ae122e4d1ee41e65ca825f72e6
---
 res/layout/wifi_dpp_qrcode_scanner_fragment.xml                | 3 ++-
 .../settings/wifi/dpp/WifiDppQrCodeScannerFragment.java        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
index 1fc95e755c9..01b9e348199 100644
--- 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"
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index 0cd7f09c2ff..e915069d05c 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -67,7 +67,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
         QrCamera.ScannerCallback,
         WifiManager.ActionListener,
         WifiTracker.WifiListener {
-    private static final String TAG = "WifiDppQrCodeScannerFragment";
+    private static final String TAG = "WifiDppQrCodeScanner";
 
     /** Message sent to hide error message */
     private static final int MESSAGE_HIDE_ERROR_MESSAGE = 1;

From 1f8cc8f96d4985d7ccd111c9cb61a8dd24d5670a Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Fri, 17 May 2019 13:44:01 -0700
Subject: [PATCH 2/2] Clean up a STOPSHIP string

Bug: 110557011
Test: rebuild
Change-Id: I06c1bc1460cbb47feb6152298151477549a9e411
---
 res/values/strings.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e007205e790..47d081f0832 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8967,12 +8967,6 @@
     <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->
     <string name="default_phone_title">Phone app</string>
 
-    <!--
-     ~ STOPSHIP(b/110557011): Remove once the new UI is ready.
-     -->
-    <!-- Title for Roles settings [CHAR LIMIT=30] -->
-    <string name="roles_title">Roles</string>
-
     <!-- Label of default app for current setting [CHAR LIMIT=40] -->
     <string name="default_app">(Default)</string>