From fbf5506b86758fa8fcd73a598decee2941b190e0 Mon Sep 17 00:00:00 2001
From: Pasty Chang <pastychang@google.com>
Date: Mon, 24 May 2021 03:24:26 +0000
Subject: [PATCH] Migrate summary text in wifi QR scan page to DescriptionMixin

The description in the setup flow would follow the new style to align to the left.

Bug: 188593594
Test: atest & manual
Change-Id: Idfc00f51710d725d5c653396902446f29861cb88
---
 .../wifi_dpp_qrcode_scanner_fragment.xml           | 13 +++----------
 res/layout/wifi_dpp_qrcode_scanner_fragment.xml    | 14 +++-----------
 .../wifi/dpp/WifiDppQrCodeScannerFragment.java     |  1 +
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
index 95fef90b4bc..742874910df 100644
--- a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
@@ -17,9 +17,11 @@
 
 <com.google.android.setupdesign.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:icon="@drawable/ic_scan_32dp">
+    android:icon="@drawable/ic_scan_32dp"
+    app:sudDescriptionText="@string/wifi_dpp_scan_qr_code_join_unknown_network">
 
     <LinearLayout
         style="@style/SudContentFrame"
@@ -28,15 +30,6 @@
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <TextView
-            android:id="@android:id/summary"
-            style="@style/TextAppearance.SudGlifBody"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginStart"
-            android:layout_marginEnd="?attr/sudMarginEnd"
-            android:textAlignment="center"/>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
index 209619c1327..380fc8a9511 100644
--- a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
@@ -17,9 +17,11 @@
 
 <com.google.android.setupdesign.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:icon="@drawable/ic_scan_32dp">
+    android:icon="@drawable/ic_scan_32dp"
+    app:sudDescriptionText="@string/wifi_dpp_scan_qr_code_join_unknown_network">
 
     <LinearLayout
         style="@style/SudContentFrame"
@@ -28,16 +30,6 @@
         android:orientation="vertical"
         android:gravity="center_horizontal">
 
-        <TextView
-            android:id="@android:id/summary"
-            style="@style/TextAppearance.SudGlifBody"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginStart"
-            android:layout_marginEnd="?attr/sudMarginEnd"
-            android:textAlignment="center"
-            android:accessibilityLiveRegion="polite"/>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index 5c800241378..d8bdf32dbf4 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -411,6 +411,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        mSummary = view.findViewById(R.id.sud_layout_subtitle);
 
         mTextureView = view.findViewById(R.id.preview_view);
         mTextureView.setSurfaceTextureListener(this);