Merge "Adjust landscape layout of QR code scanner/generator"
This commit is contained in:
@@ -25,8 +25,8 @@
|
|||||||
<include layout="@layout/wifi_dpp_fragment_header"/>
|
<include layout="@layout/wifi_dpp_fragment_header"/>
|
||||||
|
|
||||||
<com.android.settings.wifi.qrcode.QrPreviewLayout
|
<com.android.settings.wifi.qrcode.QrPreviewLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="@dimen/qrcode_preview_size"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="@dimen/qrcode_preview_size"
|
||||||
android:layout_gravity="center">
|
android:layout_gravity="center">
|
||||||
<TextureView
|
<TextureView
|
||||||
android:id="@+id/preview_view"
|
android:id="@+id/preview_view"
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<LinearLayout
|
<ScrollView
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@+id/root"
|
android:id="@+id/root"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -27,4 +27,4 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"/>
|
android:layout_height="match_parent"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</ScrollView>
|
||||||
|
@@ -367,5 +367,6 @@
|
|||||||
|
|
||||||
<!-- QR code picture size -->
|
<!-- QR code picture size -->
|
||||||
<dimen name="qrcode_size">264dp</dimen>
|
<dimen name="qrcode_size">264dp</dimen>
|
||||||
|
<dimen name="qrcode_preview_size">360dp</dimen>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
Reference in New Issue
Block a user