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

Fix padding issue on Scan QR code screen

Browse Source 
Fix: 284826809
Test: Manually when set Font and Display size to maximum
Change-Id: I3c67b5603d27cefdb4776a43d72264051f40246f
This commit is contained in:
Chaohui Wang
2023-05-31 13:52:45 +08:00
parent a171a9d426
commit f0dc0933c3
1 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
res/layout/wifi_dpp_qrcode_scanner_fragment.xml
View File

@@ -23,59 +23,46 @@
android:icon="@drawable/ic_scan_32dp" android:icon="@drawable/ic_scan_32dp"
app:sudDescriptionText="@string/wifi_dpp_scan_qr_code_join_unknown_network"> app:sudDescriptionText="@string/wifi_dpp_scan_qr_code_join_unknown_network">
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
style="@style/SudContentFrame" style="@style/SudContentFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:orientation="vertical"
android:gravity="center_horizontal">
<LinearLayout <FrameLayout
android:layout_width="match_parent" android:id="@+id/frame_layout"
android:layout_height="match_parent" android:layout_width="0dp"
android:gravity="center" android:layout_height="0dp"
android:orientation="vertical"> app:layout_constraintBottom_toTopOf="@id/error_message"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
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">
<androidx.constraintlayout.widget.ConstraintLayout <TextureView
android:id="@+id/preview_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:maxWidth="@dimen/qrcode_preview_size"
android:maxHeight="@dimen/qrcode_preview_size">
<FrameLayout <com.android.settingslib.qrcode.QrDecorateView
android:layout_width="0dp" android:id="@+id/decorate_view"
android:layout_height="0dp" android:layout_width="match_parent"
app:layout_constraintDimensionRatio="1:1" android:layout_height="match_parent" />
app:layout_constraintTop_toTopOf="parent" </FrameLayout>
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="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"
<TextView style="@style/TextAppearance.ErrorText"
android:id="@+id/error_message" android:layout_width="wrap_content"
style="@style/TextAppearance.ErrorText" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_marginVertical="16dp"
android:layout_height="wrap_content" android:visibility="invisible"
android:layout_marginTop="16dp" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="?attr/sudMarginStart" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="?attr/sudMarginEnd" app:layout_constraintStart_toStartOf="parent"
android:textAlignment="center" app:layout_constraintTop_toBottomOf="@id/frame_layout" />
android:visibility="invisible"/> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout> </com.google.android.setupdesign.GlifLayout>