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

Commit 4330b175 authored by Jiaming Cheng's avatar Jiaming Cheng
Browse files

Fix the bluetooth tile crash 

The logic has been changed with dual shade. It was initilally a flag
that the details view feature depends on. But this logic has been
removed.

So currently when QsDetailedView is enabled but it's not in dual shade
mode, it will still show the dialog since the details feature is still
disabled. The DetailsViewModel checks if `isDualShade` and prevents
details from showing if it's not dual shade.

Bug: 440607916
Flag: com.android.systemui.qs_tile_detailed_view
Test: Manually
Change-Id: I5d781af990294d1777b4609d96d48c452b85c72f
parent b65a165d

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

+0 −4
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import com.android.systemui.animation.DialogTransitionAnimator 
import com.android.systemui.bluetooth.ui.viewModel.BluetoothDetailsContentViewModel

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.qs.flags.QsDetailedView

import com.android.systemui.res.R

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.util.annotations.DeprecatedSysuiVisibleForTesting
@@ -198,9 +197,6 @@ constructor( 
            progressBarBackground =

                contentView.requireViewById(R.id.bluetooth_tile_dialog_progress_background)



            // If `QsDetailedView` is enabled, it should show the details view.

            QsDetailedView.assertInLegacyMode()



            // If rendering with tile details view, the title and subtitle will be added in the

            // `TileDetails`

            titleTextView = contentView.requireViewById(R.id.bluetooth_tile_dialog_title)

packages/SystemUI/src/com/android/systemui/bluetooth/ui/viewModel/BluetoothDetailsContentViewModel.kt

+0 −3
Original line number Diff line number Diff line
@@ -132,9 +132,6 @@ constructor( 


    /** Shows the bluetooth dialog. */

    fun showDialog(expandable: Expandable?) {

        // If `QsDetailedView` is enabled, it should show the details view.

        QsDetailedView.assertInLegacyMode()



        cancelJob()



        job =