Snap for 11200327 from 4ed55488879de07a6f4b655becfa5bc5bdf8a857 to 24Q1-release (90d0f0a3) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+17 −2

Original line number	Diff line number	Diff line
		@@ -4200,8 +4200,23 @@
		android:value="TogglePermissionAppList/MediaRoutingControl"/>
		<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
		android:value="@string/menu_key_apps"/>
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity-alias>

		<activity-alias
		android:name="AppMediaRoutingControlActivity"
		android:knownActivityEmbeddingCerts="@array/config_known_host_certs"
		android:exported="true"
		android:targetActivity=".spa.SpaAppBridgeActivity"
		android:label="@string/media_routing_control_title">
		<intent-filter android:priority="1">
		<action android:name="android.settings.REQUEST_MEDIA_ROUTING_CONTROL" />
		<category android:name="android.intent.category.DEFAULT" />
		<data android:scheme="package" />
		</intent-filter>
		<meta-data android:name="com.android.settings.spa.DESTINATION"
		android:value="TogglePermissionAppInfoPage/MediaRoutingControl"/>
		<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
		android:value="@string/menu_key_apps"/>
		</activity-alias>

		<!-- Keep compatibility with old WebView-picker implementation -->

res/drawable/audio_sharing_guidance.png

0 → 100644

+3.04 KiB

Loading image diff...

res/layout/dialog_audio_sharing.xml

+37 −11

Original line number	Diff line number	Diff line
		@@ -19,38 +19,64 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="24dp"
		android:orientation="vertical">
		android:orientation="vertical"
		android:paddingHorizontal="?android:dialogPreferredPadding"
		android:paddingBottom="?android:dialogPreferredPadding">

		<TextView
		style="@style/DeviceAudioSharingText"
		android:id="@+id/share_audio_subtitle1"
		style="@style/DeviceAudioSharingText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAlignment="center"
		android:layout_gravity="center"/>
		android:layout_gravity="center"
		android:paddingBottom="14dp"
		android:textFontWeight="500"
		android:visibility="gone" />

		<TextView
		style="@style/DeviceAudioSharingText"
		android:id="@+id/share_audio_subtitle2"
		style="@style/DeviceAudioSharingText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAlignment="center"
		android:layout_gravity="center"/>
		android:layout_gravity="center"
		android:paddingBottom="24dp"
		android:textFontWeight="400" />

		<ImageView
		android:id="@+id/share_audio_guidance"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:src="@drawable/audio_sharing_guidance"
		android:visibility="gone" />

		<com.android.internal.widget.RecyclerView
		android:visibility="visible"
		android:id="@+id/btn_list"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:nestedScrollingEnabled="false"
		android:overScrollMode="never"
		android:visibility="gone" />

		<Button
		android:id="@+id/share_btn"
		style="@style/SettingsLibActionButton"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"/>
		android:layout_gravity="center"
		android:layout_marginTop="4dp"
		android:background="@drawable/audio_sharing_rounded_bg_ripple"
		android:visibility="gone" />

		<Button
		android:id="@+id/cancel_btn"
		style="@style/SettingsLibActionButton"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:text="@string/cancel"/>
		android:layout_marginTop="4dp"
		android:background="@drawable/audio_sharing_rounded_bg_ripple"
		android:text="Not now"
		android:visibility="gone" />
		</LinearLayout>
		No newline at end of file

res/layout/dialog_audio_sharing_disconnect.xml

+11 −9

Original line number	Diff line number	Diff line
		@@ -19,29 +19,31 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="24dp"
		android:orientation="vertical">
		android:orientation="vertical"
		android:paddingHorizontal="?android:dialogPreferredPadding"
		android:paddingBottom="?android:dialogPreferredPadding">

		<TextView
		android:id="@+id/share_audio_disconnect_description"
		style="@style/DeviceAudioSharingText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAlignment="center"
		android:layout_gravity="center"/>
		android:layout_gravity="center"
		android:paddingBottom="24dp" />

		<com.android.internal.widget.RecyclerView
		android:visibility="visible"
		android:id="@+id/device_btn_list"
		android:nestedScrollingEnabled="false"
		android:overScrollMode="never"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center" />

		<Button
		android:id="@+id/cancel_btn"
		style="@style/SettingsLibActionButton"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_marginTop="4dp"
		android:background="@drawable/audio_sharing_rounded_bg_ripple"
		android:text="@string/cancel" />
		</LinearLayout>
		No newline at end of file

res/layout/dialog_audio_sharing_join.xml

+18 −9

Original line number	Diff line number	Diff line
		@@ -19,35 +19,44 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="24dp"
		android:orientation="vertical">
		android:orientation="vertical"
		android:paddingHorizontal="?android:dialogPreferredPadding"
		android:paddingBottom="?android:dialogPreferredPadding">

		<TextView
		android:id="@+id/share_audio_subtitle1"
		style="@style/DeviceAudioSharingText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAlignment="center"
		android:layout_gravity="center"/>
		android:layout_gravity="center"
		android:paddingBottom="14dp"
		android:textFontWeight="500" />

		<TextView
		android:id="@+id/share_audio_subtitle2"
		style="@style/DeviceAudioSharingText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAlignment="center"
		android:layout_gravity="center"/>
		android:layout_gravity="center"
		android:paddingBottom="24dp"
		android:textFontWeight="400" />

		<Button
		android:id="@+id/share_btn"
		style="@style/SettingsLibActionButton"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:text=""/>
		android:layout_marginTop="4dp"
		android:background="@drawable/audio_sharing_rounded_bg_ripple" />

		<Button
		android:id="@+id/cancel_btn"
		style="@style/SettingsLibActionButton"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:text="@string/cancel"/>

		android:layout_marginTop="4dp"
		android:background="@drawable/audio_sharing_rounded_bg_ripple"
		android:text="Not now" />
		</LinearLayout>
		No newline at end of file