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

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

Browse Source
This commit is contained in:
Chelsea Hao
2024-08-07 05:07:00 +00:00
committed by Android (Google) Code Review
parent 87778221d3 e7a1762ef3
commit 5473fa04f5
9 changed files with 177 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
res/layout-land/bluetooth_audio_streams_qr_code.xml
View File

@@ -15,48 +15,48 @@
~ 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_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@android:id/summary"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:textSize="15sp"
android:textColor="?android:attr/textColorPrimary" />
android:layout_height="match_parent"
android:orientation="horizontal"
android:padding="25dp"
android:gravity="center">
<TextView
android:id="@android:id/summary"
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
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="1"
android:gravity="center">
<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" />
<TextView
android:id="@+id/password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15sp"
android:textColor="?android:attr/textColorPrimary"
android:gravity="center" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<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" />
<TextView
android:id="@+id/password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15sp"
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

77
res/layout-land/qrcode_scanner_fragment.xml
View File

@@ -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">
<TextView
android:id="@android:id/summary"
style="@style/QrCodeScanner"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
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">
<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:orientation="horizontal"
android:paddingTop="@dimen/audio_streams_qrcode_scanner_fragment_padding">
<TextView
android:id="@+id/error_message"
style="@style/TextAppearance.ErrorText"
android:layout_width="wrap_content"
android:id="@android:id/summary"
style="@style/QrCodeScanner"
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:layout_marginTop="16dp"
android:gravity="center"
android:layout_gravity="center"
android:visibility="invisible"/>
android:orientation="vertical"
android:layout_weight="1"
android:gravity="center">
<TextureView
android:id="@+id/preview_view"
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="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

43
res/layout/bluetooth_audio_streams_qr_code.xml
View File

@@ -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
@@ -35,30 +34,24 @@
android:layout_height="wrap_content"
android:gravity="start"
android:textSize="15sp"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<LinearLayout
android:layout_width="match_parent"
<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:paddingTop="70dp"/>
<TextView
android:id="@+id/password"
android:layout_width="wrap_content"
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"/>
<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:textSize="15sp"
android:textColor="?android:attr/textColorPrimary"
android:gravity="center" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

66
res/layout/qrcode_scanner_fragment.xml
View File

@@ -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:orientation="vertical"
android:gravity="center"
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:paddingStart="40dp"
android:paddingEnd="40dp"
android:layout_gravity="bottom"
android:gravity="center"
android:orientation="vertical">
<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>
android:layout_margin="40dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="7"
android:orientation="vertical">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:gravity="center"
android:clipChildren="true"
<TextureView
android:id="@+id/preview_view"
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">
<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: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>

2
res/values/dimens.xml
View File

@@ -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>