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

Commit 71e45f55 authored by Matt Pietal's avatar Matt Pietal
Browse files

Remove smartspace flag 

No longer needed

Fixes: 234591987
Test: atest SystemUITests
Change-Id: I123b0dcdf451f6884afe2df2711bc2f8122ce701
parent aa2fabb9

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

+2 −5
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ object Flags { 
    val FSI_ON_DND_UPDATE = unreleasedFlag(259130119, "fsi_on_dnd_update", teamfood = true)



    // TODO(b/265804648): Tracking Bug

    @JvmField

    val DISABLE_FSI = unreleasedFlag(265804648, "disable_fsi")

    @JvmField val DISABLE_FSI = unreleasedFlag(265804648, "disable_fsi")



    // TODO(b/254512538): Tracking Bug

    val INSTANT_VOICE_REPLY = unreleasedFlag(111, "instant_voice_reply", teamfood = true)
@@ -225,7 +224,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
@@ -554,6 +552,5 @@ object Flags { 


    // 2600 - keyboard shortcut

    // TODO(b/259352579): Tracking Bug

    @JvmField

    val SHORTCUT_LIST_SEARCH_LAYOUT = unreleasedFlag(2600, "shortcut_list_search_layout")

    @JvmField val SHORTCUT_LIST_SEARCH_LAYOUT = unreleasedFlag(2600, "shortcut_list_search_layout")

}

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
@@ -207,7 +207,7 @@ constructor( 
    fun isEnabled(): Boolean {

        execution.assertIsMainThread()



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

        return plugin != null

    }



    private fun updateBypassEnabled() {

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ class NotifPipelineFlags @Inject constructor( 
    fun isDevLoggingEnabled(): Boolean =

        featureFlags.isEnabled(Flags.NOTIFICATION_PIPELINE_DEVELOPER_LOGGING)



    fun isSmartspaceDedupingEnabled(): Boolean = featureFlags.isEnabled(Flags.SMARTSPACE)



    fun fullScreenIntentRequiresKeyguard(): Boolean =

        featureFlags.isEnabled(Flags.FSI_REQUIRES_KEYGUARD)