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

Commit 575554b6 authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Revert "[SB] Never hide status bar if device isn't provisioned." 

This reverts commit bdca58ca.

Reason for revert: Not needed and possibly risky

Change-Id: I9aadd0acfa463a7fe8b08cfdbcd58a26e0192016
parent bdca58ca

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModel.kt

+5 −18
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ import com.android.systemui.statusbar.pipeline.shared.domain.interactor.HomeStat 
import com.android.systemui.statusbar.pipeline.shared.ui.model.ChipsVisibilityModel

import com.android.systemui.statusbar.pipeline.shared.ui.model.SystemInfoCombinedVisibilityModel

import com.android.systemui.statusbar.pipeline.shared.ui.model.VisibilityModel

import com.android.systemui.statusbar.policy.domain.interactor.DeviceProvisioningInteractor

import com.android.systemui.statusbar.systemstatusicons.ui.viewmodel.SystemStatusIconsViewModel

import dagger.assisted.AssistedFactory

import dagger.assisted.AssistedInject
@@ -237,7 +236,6 @@ constructor( 
    headsUpNotificationInteractor: HeadsUpNotificationInteractor,

    keyguardTransitionInteractor: KeyguardTransitionInteractor,

    keyguardInteractor: KeyguardInteractor,

    deviceProvisioningInteractor: DeviceProvisioningInteractor,

    override val operatorNameViewModel: StatusBarOperatorNameViewModel,

    sceneInteractor: SceneInteractor,

    sceneContainerOcclusionInteractor: SceneContainerOcclusionInteractor,
@@ -413,23 +411,12 @@ constructor( 
     * if we shouldn't be showing any part of the home status bar.

     */

    private val isHomeScreenStatusBarAllowedLegacy: Flow<Boolean> =

        combine(

                keyguardTransitionInteractor.currentKeyguardState,

                isShadeVisibleOnThisDisplay,

                deviceProvisioningInteractor.isDeviceProvisioned,

            ) { currentKeyguardState, isShadeVisibleOnThisDisplay, isDeviceProvisioned ->

                when {

                    // Short-term fix for b/418020209.

                    // `isShadeVisibleOnThisDisplay` is incorrectly reporting that the shade is

                    // visible during setup wizard, causing the status bar to incorrectly hide.

                    // Temporarily prevent that while we work out a safe fix inside shade code.

                    !isDeviceProvisioned -> true

                    else -> {

        combine(keyguardTransitionInteractor.currentKeyguardState, isShadeVisibleOnThisDisplay) {

                currentKeyguardState,

                isShadeVisibleOnThisDisplay ->

                (currentKeyguardState == GONE || currentKeyguardState == OCCLUDED) &&

                    !isShadeVisibleOnThisDisplay

            }

                }

            }

            .distinctUntilChanged()

            .logDiffsForTable(

                tableLogBuffer = tableLogger,

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModelKosmos.kt

+0 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import com.android.systemui.statusbar.pipeline.shared.domain.interactor.homeStat 
import com.android.systemui.statusbar.pipeline.shared.domain.interactor.homeStatusBarInteractor

import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinder

import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinderImpl

import com.android.systemui.statusbar.policy.domain.interactor.deviceProvisioningInteractor

import com.android.systemui.statusbar.systemstatusicons.ui.viewmodel.systemStatusIconsViewModelFactory



var Kosmos.homeStatusBarViewBinder: HomeStatusBarViewBinder by
@@ -73,7 +72,6 @@ var Kosmos.homeStatusBarViewModelFactory: (Int) -> HomeStatusBarViewModel by 
                headsUpNotificationInteractor,

                keyguardTransitionInteractor,

                keyguardInteractor,

                deviceProvisioningInteractor,

                statusBarOperatorNameViewModel,

                sceneInteractor,

                sceneContainerOcclusionInteractor,