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

Commit d2e6c2fe authored by Han Xu's avatar Han Xu
Browse files

Fix wifi QR layout to fix image stretching 

Bug: 270063908
Test: manual
Change-Id: I86e7d54bb78306292fcb355c1a4879a43cc876f7
parent cf440dca

res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml

deleted100644 → 0
+0 −69
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    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:gravity="center_horizontal"

        android:orientation="vertical">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="center"

            android:orientation="vertical">



            <FrameLayout

                android:layout_width="@dimen/qrcode_preview_size"

                android:layout_height="@dimen/qrcode_preview_size"

                android:clipChildren="true">

                <TextureView

                    android:id="@+id/preview_view"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"/>

                <com.android.settingslib.qrcode.QrDecorateView

                    android:id="@+id/decorate_view"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"/>

            </FrameLayout>



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



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

res/layout/wifi_dpp_qrcode_scanner_fragment.xml

+25 −13
Original line number Diff line number Diff line
@@ -36,20 +36,32 @@ 
            android:gravity="center"

            android:orientation="vertical">



            <androidx.constraintlayout.widget.ConstraintLayout

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:maxWidth="@dimen/qrcode_preview_size"

                android:maxHeight="@dimen/qrcode_preview_size">



                <FrameLayout

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                    android:layout_width="0dp"

                    android:layout_height="0dp"

                    app:layout_constraintDimensionRatio="1:1"

                    app:layout_constraintTop_toTopOf="parent"

                    app:layout_constraintStart_toStartOf="parent"

                    app:layout_constraintEnd_toEndOf="parent"

                    android:clipChildren="true">

                    <TextureView

                        android:id="@+id/preview_view"

                        android:layout_width="match_parent"

                    android:layout_height="@dimen/qrcode_preview_size"/>

                        android:layout_height="match_parent"/>

                    <com.android.settingslib.qrcode.QrDecorateView

                        android:id="@+id/decorate_view"

                        android:layout_width="match_parent"

                    android:layout_height="@dimen/qrcode_preview_size"/>

                        android:layout_height="match_parent"/>

                </FrameLayout>



            </androidx.constraintlayout.widget.ConstraintLayout>



            <TextView

                android:id="@+id/error_message"

                style="@style/TextAppearance.ErrorText"