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

Commit 75133b2e authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Make StatusBarTouchShadeDisplayPolicy the default one 

This makes the shade move to the display that had the last statusbar
touch.

+ fix policy naming issue for SpecificDisplayIdPolicy

Bug: 362719719
Bug: 380444270
Test: None
Flag: com.android.systemui.shade_window_goes_around
Change-Id: I031d0a9f4ce46650d450457167d9f59d52c07639
parent 7830dd80

packages/SystemUI/src/com/android/systemui/shade/display/ShadeDisplayPolicy.kt

+4 −3
Original line number Diff line number Diff line
@@ -31,9 +31,12 @@ interface ShadeDisplayPolicy { 


@Module

interface ShadeDisplayPolicyModule {



    @Binds fun provideDefaultPolicy(impl: StatusBarTouchShadeDisplayPolicy): ShadeDisplayPolicy



    @IntoSet

    @Binds

    fun provideDefaultPolicyToSet(impl: DefaultShadeDisplayPolicy): ShadeDisplayPolicy

    fun provideDefaultDisplayPolicyToSet(impl: DefaultDisplayShadePolicy): ShadeDisplayPolicy



    @IntoSet

    @Binds
@@ -46,6 +49,4 @@ interface ShadeDisplayPolicyModule { 
    fun provideStatusBarTouchShadeDisplayPolicy(

        impl: StatusBarTouchShadeDisplayPolicy

    ): ShadeDisplayPolicy



    @Binds fun provideDefaultPolicy(impl: DefaultShadeDisplayPolicy): ShadeDisplayPolicy

}

packages/SystemUI/src/com/android/systemui/shade/display/SpecificDisplayIdPolicy.kt

+4 −5
Original line number Diff line number Diff line
@@ -22,12 +22,11 @@ import kotlinx.coroutines.flow.MutableStateFlow 
import kotlinx.coroutines.flow.StateFlow



/** Policy to specify a display id explicitly. */

open class SpecificDisplayIdPolicy(displayId: Int) : ShadeDisplayPolicy {

    override val name: String

        get() = "display_${displayId}_policy"

open class SpecificDisplayIdPolicy(id: Int) : ShadeDisplayPolicy {

    override val name: String = "display_${id}_policy"



    override val displayId: StateFlow<Int> = MutableStateFlow(displayId)

    override val displayId: StateFlow<Int> = MutableStateFlow(id)

}



class DefaultShadeDisplayPolicy @Inject constructor() :

class DefaultDisplayShadePolicy @Inject constructor() :

    SpecificDisplayIdPolicy(Display.DEFAULT_DISPLAY)