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

Commit e81f65a6 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge changes from topic "mpietal_smartspace" into tm-qpr-dev 

* changes:
  Remove smartspace flag
  Transitions - Add GONE->LOCKSCREEN support
parents 6378bd57 71e45f55

packages/SystemUI/res/values/flags.xml

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
    <!-- Whether to show chipbar UI whenever the device is unlocked by ActiveUnlock. -->

    <bool name="flag_active_unlock_chipbar">true</bool>



    <bool name="flag_smartspace">false</bool>



    <!--  Whether the user switcher chip shows in the status bar. When true, the multi user

      avatar will no longer show on the lockscreen -->

    <bool name="flag_user_switcher_chip">false</bool>

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −1
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ object Flags { 
    // TODO(b/254513100): Tracking Bug

    val SMARTSPACE_SHARED_ELEMENT_TRANSITION_ENABLED =

        releasedFlag(401, "smartspace_shared_element_transition_enabled")

    val SMARTSPACE = resourceBooleanFlag(402, R.bool.flag_smartspace, "smartspace")



    // TODO(b/258517050): Clean up after the feature is launched.

    @JvmField

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt

+21 −0
Original line number Diff line number Diff line
@@ -45,6 +45,27 @@ constructor( 
    override fun start() {

        listenForGoneToAodOrDozing()

        listenForGoneToDreaming()

        listenForGoneToLockscreen()

    }



    // Primarily for when the user chooses to lock down the device

    private fun listenForGoneToLockscreen() {

        scope.launch {

            keyguardInteractor.isKeyguardShowing

                .sample(keyguardTransitionInteractor.startedKeyguardTransitionStep, ::Pair)

                .collect { (isKeyguardShowing, lastStartedStep) ->

                    if (isKeyguardShowing && lastStartedStep.to == KeyguardState.GONE) {

                        keyguardTransitionRepository.startTransition(

                            TransitionInfo(

                                name,

                                KeyguardState.GONE,

                                KeyguardState.LOCKSCREEN,

                                getAnimator(),

                            )

                        )

                    }

                }

        }

    }



    private fun listenForGoneToDreaming() {

packages/SystemUI/src/com/android/systemui/smartspace/preconditions/LockscreenPrecondition.kt

+3 −7
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package com.android.systemui.smartspace.preconditions



import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.smartspace.SmartspacePrecondition

import com.android.systemui.statusbar.policy.DeviceProvisionedController

import com.android.systemui.util.concurrency.Execution
@@ -24,11 +22,9 @@ import javax.inject.Inject 


/**

 * {@link LockscreenPrecondition} covers the conditions that must be met before Smartspace can be

 * used over lockscreen. These conditions include the device being provisioned with a setup user

 * and the Smartspace feature flag enabled.

 * used over lockscreen. These conditions include the device being provisioned with a setup user.

 */

class LockscreenPrecondition @Inject constructor(

    private val featureFlags: FeatureFlags,

    private val deviceProvisionedController: DeviceProvisionedController,

    private val execution: Execution

) : SmartspacePrecondition {
@@ -90,6 +86,6 @@ class LockscreenPrecondition @Inject constructor( 


    override fun conditionsMet(): Boolean {

        execution.assertIsMainThread()

        return featureFlags.isEnabled(Flags.SMARTSPACE) && deviceReady

        return deviceReady

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ constructor( 
    fun isEnabled(): Boolean {

        execution.assertIsMainThread()



        return featureFlags.isEnabled(Flags.SMARTSPACE) && plugin != null

        return plugin != null

    }



    private fun updateBypassEnabled() {