Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b15fd623 authored by Pasty Chang's avatar Pasty Chang Committed by Android (Google) Code Review
Browse files

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

parents 259b6788 fbf5506b

res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml

+3 −10
Original line number Diff line number Diff line
@@ -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"

res/layout/wifi_dpp_qrcode_scanner_fragment.xml

+3 −11
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -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);