Merge changes I06c1bc14,I5415b8ed into qt-dev

* changes:
  Clean up a STOPSHIP string
  Fix view overlap in wifi dpp enrollment.

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"

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>
 

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;