PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate summary text in wifi QR scan page to DescriptionMixin" into sc-dev am: b15fd6233f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682959

Change-Id: I07a43560b844bdf185a847ead53f3edcfa80206e
This commit is contained in:
Pasty Chang
2021-05-25 08:34:33 +00:00
committed by Automerger Merge Worker
parent 2d74dfc566 b15fd6233f
commit 36fd7cf3c9
3 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
View File

@@ -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"

14
res/layout/wifi_dpp_qrcode_scanner_fragment.xml
View File

@@ -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"

1
src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
View File

@@ -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);