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

Commit 9a623ab0 authored by chelseahao's avatar chelseahao Committed by Chelsea Hao
Browse files

Changed auto on toggle's fixed height to wrap_content and keep it enabled. 

Flag: NA
Test: manual
Bug: b/335094599, b/334810653
Change-Id: I10be2e08e359a8d781e8230aa3a8ee3cbe15db75
parent 889e919a

packages/SystemUI/res/layout/bluetooth_tile_dialog.xml

+2 −1
Original line number Diff line number Diff line
@@ -136,7 +136,8 @@ 
            <TextView

                android:id="@+id/bluetooth_auto_on_toggle_title"

                android:layout_width="0dp"

                android:layout_height="68dp"

                android:layout_height="wrap_content"

                android:minHeight="68dp"

                android:layout_marginBottom="20dp"

                android:maxLines="2"

                android:ellipsize="end"

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothTileDialogDelegate.kt

+2 −10
Original line number Diff line number Diff line
@@ -204,11 +204,7 @@ internal constructor( 
        isEnabled: Boolean,

        @StringRes infoResId: Int

    ) {

        getAutoOnToggle(dialog).apply {

            isChecked = isEnabled

            setEnabled(true)

            alpha = ENABLED_ALPHA

        }

        getAutoOnToggle(dialog).isChecked = isEnabled

        getAutoOnToggleInfoTextView(dialog).text = dialog.context.getString(infoResId)

    }
@@ -236,12 +232,8 @@ internal constructor( 
        }



        getAutoOnToggleView(dialog).visibility = initialUiProperties.autoOnToggleVisibility

        getAutoOnToggle(dialog).setOnCheckedChangeListener { view, isChecked ->

        getAutoOnToggle(dialog).setOnCheckedChangeListener { _, isChecked ->

            mutableBluetoothAutoOnToggle.value = isChecked

            view.apply {

                isEnabled = false

                alpha = DISABLED_ALPHA

            }

            uiEventLogger.log(BluetoothTileDialogUiEvent.BLUETOOTH_AUTO_ON_TOGGLE_CLICKED)

        }

    }