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

Adjust camera preview area to square

Browse Source 
1.Choose the smaller size of both dimensions as its size.
2.Set transform matrix to crop and center the preview picture.

Bug: 118797380
Test: make RunSettingsRoboTests
Change-Id: Ic65fb1fe0c5082995d6903f50dda48eec16c3fb1
This commit is contained in:
Johnson Lu
2018-12-15 11:50:46 +08:00
parent c748b6eeef
commit ebbb0bc563
7 changed files with 155 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
View File

@@ -24,20 +24,19 @@
<include layout="@layout/wifi_dpp_fragment_header"/>
<FrameLayout
<com.android.settings.wifi.qrcode.QrPreviewLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<SurfaceView
android:layout_height="match_parent"
android:layout_gravity="center">
<TextureView
android:id="@+id/preview_view"
android:layout_width="426dp"
android:layout_height="320dp"
android:layout_gravity="center"/>
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
<com.android.settings.wifi.qrcode.QrDecorateView
android:id="@+id/decorate_view"
android:layout_width="426dp"
android:layout_height="320dp"
android:layout_gravity="center"/>
</FrameLayout>
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
</com.android.settings.wifi.qrcode.QrPreviewLayout>
<TextView android:id="@+id/error_message"
android:layout_width="wrap_content"

16
res/layout/wifi_dpp_qrcode_scanner_fragment.xml
View File

@@ -24,20 +24,20 @@
<include layout="@layout/wifi_dpp_fragment_header"/>
<FrameLayout
<com.android.settings.wifi.qrcode.QrPreviewLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<SurfaceView
android:layout_height="match_parent">
<TextureView
android:id="@+id/preview_view"
android:layout_width="320dp"
android:layout_height="426dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<com.android.settings.wifi.qrcode.QrDecorateView
android:id="@+id/decorate_view"
android:layout_width="320dp"
android:layout_height="426dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
</FrameLayout>
</com.android.settings.wifi.qrcode.QrPreviewLayout>
<TextView android:id="@+id/error_message"
android:layout_width="wrap_content"