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

Commit 5473fa04 authored by Chelsea Hao's avatar Chelsea Hao Committed by Android (Google) Code Review
Browse files

Merge "[Audiosharing] When landscape mode, collapse app bar to make more... 

Merge "[Audiosharing] When landscape mode, collapse app bar to make more space. Also refined fragments and make them scrollable." into main
parents 87778221 e7a1762e

res/layout-land/bluetooth_audio_streams_qr_code.xml

+38 −38
Original line number Diff line number Diff line
@@ -15,34 +15,33 @@ 
  ~ limitations under the License.

  -->



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

<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:padding="25dp"

    android:baselineAligned="false">

    android:layout_height="wrap_content">



        <LinearLayout

        android:layout_width="0dp"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="vertical">

            android:orientation="horizontal"

            android:padding="25dp"

            android:gravity="center">



            <TextView

                android:id="@android:id/summary"

            android:layout_width="match_parent"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:gravity="start"

                android:textSize="15sp"

                android:textColor="?android:attr/textColorPrimary"/>

    </LinearLayout>



            <LinearLayout

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:layout_weight="1"

        android:gravity="center"

        android:orientation="vertical">

                android:gravity="center">



                <ImageView

                    android:id="@+id/qrcode_view"
@@ -56,7 +55,8 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:textSize="15sp"

            android:textColor="?android:attr/textColorPrimary" />

                    android:textColor="?android:attr/textColorPrimary"

                    android:gravity="center" />

            </LinearLayout>



    </LinearLayout>

</androidx.core.widget.NestedScrollView>
 
 No newline at end of file

res/layout-land/qrcode_scanner_fragment.xml

+29 −44
Original line number Diff line number Diff line
@@ -15,60 +15,45 @@ 
     limitations under the License.

-->



<LinearLayout

<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal">

    android:layout_height="wrap_content">



    <LinearLayout

        android:layout_width="0dp"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="vertical">

        android:orientation="horizontal"

        android:paddingTop="@dimen/audio_streams_qrcode_scanner_fragment_padding">



        <TextView

            android:id="@android:id/summary"

            style="@style/QrCodeScanner"

                android:gravity="center"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"/>

        </LinearLayout>

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:gravity="center" />



        <LinearLayout

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:layout_weight="1"

        android:gravity="center"

        android:orientation="vertical">



        <FrameLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="top"

            android:gravity="center"

            android:clipChildren="true"

            android:contentDescription="@string/audio_streams_qr_code_scanner_label"

            android:focusable="true">

            android:gravity="center">

            <TextureView

                android:id="@+id/preview_view"

                android:layout_marginStart="@dimen/qrcode_preview_margin"

                android:layout_marginEnd="@dimen/qrcode_preview_margin"

                android:layout_width="match_parent"

                android:layout_height="@dimen/qrcode_preview_size"/>

        </FrameLayout>



                android:layout_width="@dimen/audio_streams_qrcode_preview_size"

                android:layout_height="@dimen/audio_streams_qrcode_preview_size"

                android:contentDescription="@string/audio_streams_qr_code_scanner_label"

                android:focusable="true" />

            <TextView

                android:id="@+id/error_message"

                style="@style/TextAppearance.ErrorText"

            android:layout_width="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

            android:gravity="center"

            android:layout_gravity="center"

            android:visibility="invisible"/>



                android:visibility="gone"/>

        </LinearLayout>





    </LinearLayout>



</androidx.core.widget.NestedScrollView>

res/layout/bluetooth_audio_streams_qr_code.xml

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

  -->



<LinearLayout

<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">
@@ -23,10 +23,9 @@ 
    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipToPadding="false"

        android:paddingLeft="25dp"

        android:paddingRight="25dp"

        android:gravity="center_horizontal"

        android:gravity="center"

        android:orientation="vertical">



        <TextView
@@ -37,28 +36,22 @@ 
            android:textSize="15sp"

            android:textColor="?android:attr/textColorPrimary" />



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:orientation="vertical"

            android:paddingTop="70dp">



        <ImageView

            android:id="@+id/qrcode_view"

            android:layout_width="@dimen/qrcode_size"

            android:layout_height="@dimen/qrcode_size"

            android:contentDescription="@string/qr_code_content_description"

                android:focusable="true"/>

            android:focusable="true"

            android:paddingTop="70dp"/>



        <TextView

            android:id="@+id/password"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textSize="15sp"

                android:textColor="?android:attr/textColorPrimary"/>

        </LinearLayout>

            android:textColor="?android:attr/textColorPrimary"

            android:gravity="center" />



    </LinearLayout>



</LinearLayout>
 
 No newline at end of file
 
</androidx.core.widget.NestedScrollView>
 
 No newline at end of file

res/layout/qrcode_scanner_fragment.xml

+19 −47
Original line number Diff line number Diff line
@@ -15,69 +15,41 @@ 
     limitations under the License.

-->



<LinearLayout

<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    android:layout_height="wrap_content">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="3"

        android:layout_marginBottom="55dp">

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingStart="40dp"

            android:paddingEnd="40dp"

            android:layout_gravity="bottom"

        android:orientation="vertical"

        android:gravity="center"

            android:orientation="vertical">

        android:layout_margin="20dp">



        <TextView

            android:id="@android:id/summary"

            style="@style/QrCodeScanner"

            android:gravity="center"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

                android:layout_marginTop="20dp"/>

        </LinearLayout>

    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="7"

        android:orientation="vertical">

            android:layout_margin="40dp" />



        <FrameLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="top"

            android:gravity="center"

            android:clipChildren="true"

            android:contentDescription="@string/audio_streams_qr_code_scanner_label"

            android:focusable="true">

        <TextureView

            android:id="@+id/preview_view"

                android:layout_marginStart="@dimen/qrcode_preview_margin"

                android:layout_marginEnd="@dimen/qrcode_preview_margin"

                android:layout_width="match_parent"

                android:layout_height="@dimen/qrcode_preview_size"/>

        </FrameLayout>

            android:layout_width="@dimen/audio_streams_qrcode_preview_size"

            android:layout_height="@dimen/audio_streams_qrcode_preview_size"

            android:contentDescription="@string/audio_streams_qr_code_scanner_label"

            android:focusable="true" />



        <TextView

            android:id="@+id/error_message"

            style="@style/TextAppearance.ErrorText"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

            android:gravity="center"

            android:layout_gravity="center"

            android:visibility="invisible"/>



            android:visibility="gone"/>

    </LinearLayout>





</LinearLayout>

</androidx.core.widget.NestedScrollView>

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -500,7 +500,9 @@ 
    <dimen name="contrast_button_horizontal_spacing">16dp</dimen>



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

    <dimen name="audio_streams_qrcode_preview_size">300dp</dimen>

    <dimen name="audio_streams_qrcode_preview_radius">30dp</dimen>

    <dimen name="audio_streams_qrcode_scanner_fragment_padding">16dp</dimen>



    <!-- Zen Modes -->

    <dimen name="zen_mode_header_size">136dp</dimen>