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

Commit d5f9f6c8 authored by amehfooz's avatar amehfooz
Browse files

Hide View based chips when StatusBarChipsModernization is enabled 

Test: Manual, make sure no chips are shown in the status bar.
Bug: b/372657935
Flag: com.android.systemui.status_bar_chips_modernization

Change-Id: Ifc08dfeb1f66e66d20c59a7f77f8ad4ebe5bc38a
parent e891c195

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt

+11 −2
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.statusbar.events.shared.model.SystemEventAnimationSt 
import com.android.systemui.statusbar.notification.icon.ui.viewbinder.ConnectedDisplaysStatusBarNotificationIconViewStore

import com.android.systemui.statusbar.notification.shared.NotificationsLiveDataStoreRefactor

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel

import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel.VisibilityModel

import javax.inject.Inject
@@ -115,7 +116,11 @@ constructor( 
                    }

                }



                if (Flags.statusBarScreenSharingChips() && !StatusBarNotifChips.isEnabled) {

                if (

                    Flags.statusBarScreenSharingChips() &&

                        !StatusBarNotifChips.isEnabled &&

                        !StatusBarChipsModernization.isEnabled

                ) {

                    val primaryChipView: View =

                        view.requireViewById(R.id.ongoing_activity_chip_primary)

                    launch {
@@ -157,7 +162,11 @@ constructor( 
                    }

                }



                if (Flags.statusBarScreenSharingChips() && StatusBarNotifChips.isEnabled) {

                if (

                    Flags.statusBarScreenSharingChips() &&

                        StatusBarNotifChips.isEnabled &&

                        !StatusBarChipsModernization.isEnabled

                ) {

                    val primaryChipView: View =

                        view.requireViewById(R.id.ongoing_activity_chip_primary)

                    val secondaryChipView: View =

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt

+9 −1
Original line number Diff line number Diff line
@@ -164,11 +164,19 @@ fun StatusBarRoot( 
                        statusBarViewModel.iconBlockList,

                    )



                    if (!StatusBarChipsModernization.isEnabled) {

                    if (StatusBarChipsModernization.isEnabled) {

                        // Make sure the primary chip is hidden when StatusBarChipsModernization is

                        // enabled. OngoingActivityChips will be shown in a composable container

                        // when this flag is enabled.

                        phoneStatusBarView

                            .requireViewById<View>(R.id.ongoing_activity_chip_primary)

                            .visibility = View.GONE

                    } else {

                        ongoingCallController.setChipView(

                            phoneStatusBarView.requireViewById(R.id.ongoing_activity_chip_primary)

                        )

                    }



                    // For notifications, first inflate the [NotificationIconContainer]

                    val notificationIconArea =

                        phoneStatusBarView.requireViewById<ViewGroup>(R.id.notification_icon_area)