Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0c2cc44 authored by Johnson Lu's avatar Johnson Lu Committed by Android (Google) Code Review
Browse files

Merge "Adjust landscape layout of QR code scanner/generator"

parents 564f4b6c cb36eb39

res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
    <include layout="@layout/wifi_dpp_fragment_header"/>



    <com.android.settings.wifi.qrcode.QrPreviewLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_width="@dimen/qrcode_preview_size"

        android:layout_height="@dimen/qrcode_preview_size"

        android:layout_gravity="center">

        <TextureView

            android:id="@+id/preview_view"

res/layout/wifi_dpp_activity.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
     limitations under the License.

-->



<LinearLayout

<ScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/root"

    android:layout_width="match_parent"
@@ -27,4 +27,4 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



</LinearLayout>
 
</ScrollView>

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -367,5 +367,6 @@ 


    <!-- QR code picture size -->

    <dimen name="qrcode_size">264dp</dimen>

    <dimen name="qrcode_preview_size">360dp</dimen>



</resources>