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

Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 129e80c7d8 am: 317ca924a0

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

Change-Id: Ic66add1ebadccd7d86a842f6dd42a2f1332fbf68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2023-06-02 16:25:09 +00:00
committed by Automerger Merge Worker
parent 5a718028b0 317ca924a0
commit cbb127a4e5
1 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
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
android:layout_width="match_parent"
android:layout_height="match_parent"
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 <FrameLayout
android:id="@+id/frame_layout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/error_message"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="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 <TextureView
android:id="@+id/preview_view" 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" />
<com.android.settingslib.qrcode.QrDecorateView <com.android.settingslib.qrcode.QrDecorateView
android:id="@+id/decorate_view" android:id="@+id/decorate_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent" />
</FrameLayout> </FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
android:id="@+id/error_message" android:id="@+id/error_message"
style="@style/TextAppearance.ErrorText" style="@style/TextAppearance.ErrorText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginVertical="16dp"
android:layout_marginStart="?attr/sudMarginStart" android:visibility="invisible"
android:layout_marginEnd="?attr/sudMarginEnd" app:layout_constraintBottom_toBottomOf="parent"
android:textAlignment="center" app:layout_constraintEnd_toEndOf="parent"
android:visibility="invisible"/> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/frame_layout" />
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout> </com.google.android.setupdesign.GlifLayout>