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

Commit 317ca924 authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792 am: 129e80c7 

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



Change-Id: I11733e5f2be96e9ac6fc5278d45fa58b5f5e44c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d19f4f85 129e80c7

res/layout/wifi_dpp_qrcode_scanner_fragment.xml

+33 −46
Original line number Diff line number Diff line
@@ -23,59 +23,46 @@ 
    android:icon="@drawable/ic_scan_32dp"

    app:sudDescriptionText="@string/wifi_dpp_scan_qr_code_join_unknown_network">



    <LinearLayout

        style="@style/SudContentFrame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:gravity="center_horizontal">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="center"

            android:orientation="vertical">



    <androidx.constraintlayout.widget.ConstraintLayout

        style="@style/SudContentFrame"

        android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:maxWidth="@dimen/qrcode_preview_size"

                android:maxHeight="@dimen/qrcode_preview_size">

        android:layout_height="match_parent">



        <FrameLayout

            android:id="@+id/frame_layout"

            android:layout_width="0dp"

            android:layout_height="0dp"

            app:layout_constraintBottom_toTopOf="@id/error_message"

            app:layout_constraintDimensionRatio="1:1"

                    app:layout_constraintTop_toTopOf="parent"

                    app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

                    android:clipChildren="true">

            app:layout_constraintHeight_max="@dimen/qrcode_preview_size"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintWidth_max="@dimen/qrcode_preview_size">



            <TextureView

                android:id="@+id/preview_view"

                android:layout_width="match_parent"

                android:layout_height="match_parent" />



            <com.android.settingslib.qrcode.QrDecorateView

                android:id="@+id/decorate_view"

                android:layout_width="match_parent"

                android:layout_height="match_parent" />

        </FrameLayout>



            </androidx.constraintlayout.widget.ConstraintLayout>



        <TextView

            android:id="@+id/error_message"

            style="@style/TextAppearance.ErrorText"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

                android:layout_marginStart="?attr/sudMarginStart"

                android:layout_marginEnd="?attr/sudMarginEnd"

                android:textAlignment="center"

                android:visibility="invisible"/>



        </LinearLayout>



    </LinearLayout>

            android:layout_marginVertical="16dp"

            android:visibility="invisible"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@id/frame_layout" />

    </androidx.constraintlayout.widget.ConstraintLayout>



</com.google.android.setupdesign.GlifLayout>