Merge cherrypicks of ['googleplex-android-review.googlesource.com/25499074',... (bb994962) · Commits · e / os / android_frameworks_base

core/java/android/nfc/cardemulation/ApduServiceInfo.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,10 +21,10 @@
		package android.nfc.cardemulation;

		import android.annotation.FlaggedApi;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.ComponentName;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		@@ -374,7 +374,7 @@ public final class ApduServiceInfo implements Parcelable {
		// Set uid
		mUid = si.applicationInfo.uid;

		mOtherServiceEnabled = false; // support other category
		mOtherServiceEnabled = true; // support other category

		}

packages/SystemUI/res/layout/bluetooth_device_item.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@
		android:textDirection="locale"
		android:textAlignment="gravity"
		android:paddingStart="20dp"
		android:paddingTop="10dp"
		android:paddingTop="15dp"
		android:maxLines="1"
		android:ellipsize="end"
		app:layout_constraintTop_toTopOf="parent"
		@@ -56,7 +56,7 @@
		android:id="@+id/bluetooth_device_summary"
		style="@style/BluetoothTileDialog.DeviceSummary"
		android:paddingStart="20dp"
		android:paddingBottom="10dp"
		android:paddingBottom="15dp"
		android:maxLines="1"
		android:ellipsize="end"
		app:layout_constraintTop_toBottomOf="@+id/bluetooth_device_name"

packages/SystemUI/res/layout/bluetooth_tile_dialog.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -51,13 +51,14 @@
		android:textAppearance="@style/TextAppearance.Dialog.Body.Message"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintBottom_toTopOf="@+id/scroll_view"
		app:layout_constraintTop_toBottomOf="@id/bluetooth_tile_dialog_title" />

		<androidx.core.widget.NestedScrollView
		android:id="@+id/scroll_view"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="21dp"
		android:fillViewport="true"
		app:layout_constrainedHeight="true"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		@@ -84,13 +85,13 @@
		android:textSize="16sp"
		app:layout_constraintEnd_toStartOf="@+id/bluetooth_toggle"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintBottom_toTopOf="@+id/device_list"
		app:layout_constraintTop_toTopOf="parent" />

		<Switch
		android:id="@+id/bluetooth_toggle"
		android:layout_width="wrap_content"
		android:layout_height="48dp"
		android:paddingTop="10dp"
		android:gravity="start\|center_vertical"
		android:paddingEnd="40dp"
		android:contentDescription="@string/turn_on_bluetooth"
		@@ -100,14 +101,13 @@
		android:track="@drawable/settingslib_track_selector"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toEndOf="@+id/bluetooth_toggle_title"
		app:layout_constraintBottom_toTopOf="@+id/device_list"
		app:layout_constraintTop_toTopOf="parent" />

		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/device_list"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="10dp"
		android:layout_marginTop="20dp"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/bluetooth_toggle"
		@@ -146,6 +146,7 @@
		android:background="@drawable/bluetooth_tile_dialog_bg_off"
		android:layout_width="0dp"
		android:layout_height="64dp"
		android:layout_marginBottom="9dp"
		android:contentDescription="@string/accessibility_bluetooth_device_settings_pair_new_device"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		@@ -177,7 +178,6 @@
		android:maxLines="1"
		android:text="@string/inline_done_button"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toBottomOf="@id/pair_new_device_button"
		app:layout_constraintBottom_toBottomOf="parent" />
		</androidx.constraintlayout.widget.ConstraintLayout>
		</androidx.core.widget.NestedScrollView>

packages/SystemUI/src/com/android/systemui/Prefs.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,8 @@ public final class Prefs {
		Key.ACCESSIBILITY_FLOATING_MENU_POSITION,
		Key.HAS_CLICKED_NUDGE_TO_SETUP_DREAM,
		Key.HAS_DISMISSED_NUDGE_TO_SETUP_DREAM,
		Key.HAS_ACCESSIBILITY_FLOATING_MENU_TUCKED
		Key.HAS_ACCESSIBILITY_FLOATING_MENU_TUCKED,
		Key.BLUETOOTH_TILE_DIALOG_CONTENT_HEIGHT,
		})
		// TODO: annotate these with their types so {@link PrefsCommandLine} can know how to set them
		public @interface Key {
		@@ -119,6 +120,7 @@ public final class Prefs {
		String HAS_CLICKED_NUDGE_TO_SETUP_DREAM = "HasClickedNudgeToSetupDream";
		String HAS_DISMISSED_NUDGE_TO_SETUP_DREAM = "HasDismissedNudgeToSetupDream";
		String HAS_ACCESSIBILITY_FLOATING_MENU_TUCKED = "HasAccessibilityFloatingMenuTucked";
		String BLUETOOTH_TILE_DIALOG_CONTENT_HEIGHT = "BluetoothTileDialogContentHeight";
		}

		public static boolean getBoolean(Context context, @Key String key, boolean defaultValue) {

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialog.kt

+23 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.view.View.AccessibilityDelegate
		import android.view.View.GONE
		import android.view.View.VISIBLE
		import android.view.ViewGroup
		import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
		import android.view.accessibility.AccessibilityNodeInfo
		import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction
		import android.widget.ImageView
		@@ -54,6 +55,7 @@ internal class BluetoothTileDialog
		constructor(
		private val bluetoothToggleInitialValue: Boolean,
		private val subtitleResIdInitialValue: Int,
		private val cachedContentHeight: Int,
		private val bluetoothTileDialogCallback: BluetoothTileDialogCallback,
		@Main private val mainDispatcher: CoroutineDispatcher,
		private val systemClock: SystemClock,
		@@ -72,6 +74,11 @@ constructor(
		internal val deviceItemClick
		get() = mutableDeviceItemClick.asSharedFlow()

		private val mutableContentHeight: MutableSharedFlow<Int> =
		MutableSharedFlow(extraBufferCapacity = 1)
		internal val contentHeight
		get() = mutableContentHeight.asSharedFlow()

		private val deviceItemAdapter: Adapter = Adapter(bluetoothTileDialogCallback)

		private var lastUiUpdateMs: Long = -1
		@@ -84,6 +91,7 @@ constructor(
		private lateinit var seeAllButton: View
		private lateinit var pairNewDeviceButton: View
		private lateinit var deviceListView: RecyclerView
		private lateinit var scrollViewContent: View

		override fun onCreate(savedInstanceState: Bundle?) {
		super.onCreate(savedInstanceState)
		@@ -110,12 +118,23 @@ constructor(
		pairNewDeviceButton.setOnClickListener {
		bluetoothTileDialogCallback.onPairNewDeviceClicked(it)
		}
		requireViewById<View>(R.id.scroll_view).apply {
		scrollViewContent = this
		layoutParams.height = cachedContentHeight
		}
		}

		override fun start() {
		lastUiUpdateMs = systemClock.elapsedRealtime()
		}

		override fun dismiss() {
		if (::scrollViewContent.isInitialized) {
		mutableContentHeight.tryEmit(scrollViewContent.measuredHeight)
		}
		super.dismiss()
		}

		internal suspend fun onDeviceItemUpdated(
		deviceItem: List<DeviceItem>,
		showSeeAll: Boolean,
		@@ -124,14 +143,16 @@ constructor(
		withContext(mainDispatcher) {
		val start = systemClock.elapsedRealtime()
		val itemRow = deviceItem.size + showSeeAll.toInt() + showPairNewDevice.toInt()
		// Add a slight delay for smoother dialog height change
		if (itemRow != lastItemRow) {
		// If not the first load, add a slight delay for smoother dialog height change
		if (itemRow != lastItemRow && lastItemRow != -1) {
		delay(MIN_HEIGHT_CHANGE_INTERVAL_MS - (start - lastUiUpdateMs))
		}
		if (isActive) {
		deviceItemAdapter.refreshDeviceItemList(deviceItem) {
		seeAllButton.visibility = if (showSeeAll) VISIBLE else GONE
		pairNewDeviceButton.visibility = if (showPairNewDevice) VISIBLE else GONE
		// Update the height after data is updated
		scrollViewContent.layoutParams.height = WRAP_CONTENT
		lastUiUpdateMs = systemClock.elapsedRealtime()
		lastItemRow = itemRow
		logger.logDeviceUiUpdate(lastUiUpdateMs - start)