diff options
4 files changed, 24 insertions, 6 deletions
diff --git a/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml b/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml index ac781ec2be68..13355f374dd6 100644 --- a/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml +++ b/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml @@ -181,12 +181,11 @@ <TextView android:id="@+id/bluetooth_auto_on_toggle_info_text" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:paddingStart="36dp" android:paddingEnd="40dp" - android:text="@string/turn_on_bluetooth_auto_info" android:textAppearance="@style/TextAppearance.Dialog.Body.Message" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index f71c4155771b..517f88b7f571 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -680,8 +680,10 @@ <string name="accessibility_quick_settings_bluetooth_device_tap_to_activate">activate</string> <!-- QuickSettings: Bluetooth auto on tomorrow [CHAR LIMIT=NONE]--> <string name="turn_on_bluetooth_auto_tomorrow">Automatically turn on again tomorrow</string> - <!-- QuickSettings: Bluetooth auto on info text [CHAR LIMIT=NONE]--> - <string name="turn_on_bluetooth_auto_info">Features like Quick Share, Find My Device, and device location use Bluetooth</string> + <!-- QuickSettings: Bluetooth auto on info text when disabled [CHAR LIMIT=NONE]--> + <string name="turn_on_bluetooth_auto_info_disabled">Features like Quick Share, Find My Device, and device location use Bluetooth</string> + <!-- QuickSettings: Bluetooth auto on info text when enabled [CHAR LIMIT=NONE]--> + <string name="turn_on_bluetooth_auto_info_enabled">Bluetooth will turn on tomorrow at 5 AM</string> <!-- QuickSettings: Bluetooth secondary label for the battery level of a connected device [CHAR LIMIT=20]--> <string name="quick_settings_bluetooth_secondary_label_battery_level"><xliff:g id="battery_level_as_percentage">%s</xliff:g> battery</string> diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogDelegate.kt index 7ece6e0defc1..9d5370354fe8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogDelegate.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogDelegate.kt @@ -32,6 +32,7 @@ import android.widget.ImageView import android.widget.ProgressBar import android.widget.Switch import android.widget.TextView +import androidx.annotation.StringRes import androidx.recyclerview.widget.AsyncListDiffer import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.LinearLayoutManager @@ -204,12 +205,17 @@ internal constructor( getAutoOnToggleView(dialog).visibility = uiProperties.autoOnToggleVisibility } - internal fun onBluetoothAutoOnUpdated(dialog: SystemUIDialog, isEnabled: Boolean) { + internal fun onBluetoothAutoOnUpdated( + dialog: SystemUIDialog, + isEnabled: Boolean, + @StringRes infoResId: Int + ) { getAutoOnToggle(dialog).apply { isChecked = isEnabled setEnabled(true) alpha = ENABLED_ALPHA } + getAutoOnToggleInfoTextView(dialog).text = context.getString(infoResId) } private fun setupToggle(dialog: SystemUIDialog) { @@ -264,6 +270,10 @@ internal constructor( return dialog.requireViewById(R.id.bluetooth_auto_on_toggle_layout) } + private fun getAutoOnToggleInfoTextView(dialog: SystemUIDialog): TextView { + return dialog.requireViewById(R.id.bluetooth_auto_on_toggle_info_text) + } + private fun getProgressBarAnimation(dialog: SystemUIDialog): ProgressBar { return dialog.requireViewById(R.id.bluetooth_tile_dialog_progress_animation) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt index 04862077969d..e4f3c199371e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt @@ -191,7 +191,14 @@ constructor( // bluetoothAutoOnUpdate is emitted when bluetooth auto on on/off state is // changed. bluetoothAutoOnInteractor.isEnabled - .onEach { dialogDelegate.onBluetoothAutoOnUpdated(dialog, it) } + .onEach { + dialogDelegate.onBluetoothAutoOnUpdated( + dialog, + it, + if (it) R.string.turn_on_bluetooth_auto_info_enabled + else R.string.turn_on_bluetooth_auto_info_disabled + ) + } .launchIn(this) // bluetoothAutoOnToggle is emitted when user toggles the bluetooth auto on |