Merge "Fix Wi-Fi QR code scanner height at 360dp" into qt-dev (26ff84d3) · Commits · e / os / android_packages_apps_Settings

res/layout/wifi_dpp_qrcode_scanner_fragment.xml

+4 −7

Original line number	Diff line number	Diff line
		@@ -43,21 +43,18 @@
		android:layout_marginBottom="8dp"
		style="?android:attr/progressBarStyleHorizontal"/>

		<androidx.constraintlayout.widget.ConstraintLayout
		xmlns:app="http://schemas.android.com/apk/res-auto"
		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">
		<TextureView
		android:id="@+id/preview_view"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		app:layout_constraintDimensionRatio="1:1"/>
		android:layout_height="@dimen/qrcode_preview_size"/>
		<com.android.settings.wifi.qrcode.QrDecorateView
		android:id="@+id/decorate_view"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		app:layout_constraintDimensionRatio="1:1"/>
		</androidx.constraintlayout.widget.ConstraintLayout>
		android:layout_height="@dimen/qrcode_preview_size"/>
		</FrameLayout>

		<TextView
		android:id="@+id/error_message"

+0 −3

Original line number	Diff line number	Diff line
		@@ -313,9 +313,6 @@ public class QrCamera extends Handler {
		private void setTransformationMatrix(Size viewSize) {
		// Check aspect ratio, can only handle square view.
		final int viewRatio = (int)getRatio(viewSize.getWidth(), viewSize.getHeight());
		if (viewRatio != 1) {
		throw new IllegalArgumentException("Preview area should be square");
		}

		final boolean isPortrait = mContext.get().getResources().getConfiguration().orientation
		== Configuration.ORIENTATION_PORTRAIT ? true : false;