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

Commit 83f04849 authored by Darrell Shi's avatar Darrell Shi Committed by Android (Google) Code Review
Browse files

Merge "Dismiss keyguard before starting edit activity" into main

parents 38113e6b d618866d

packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.kt

+6 −10
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.systemui.communal.dagger



import android.content.Context

import com.android.systemui.communal.data.db.CommunalDatabaseModule

import com.android.systemui.communal.data.repository.CommunalMediaRepositoryModule

import com.android.systemui.communal.data.repository.CommunalRepositoryModule
@@ -24,9 +23,8 @@ import com.android.systemui.communal.data.repository.CommunalTutorialRepositoryM 
import com.android.systemui.communal.data.repository.CommunalWidgetRepositoryModule

import com.android.systemui.communal.widgets.EditWidgetsActivityStarter

import com.android.systemui.communal.widgets.EditWidgetsActivityStarterImpl

import com.android.systemui.dagger.qualifiers.Application

import dagger.Binds

import dagger.Module

import dagger.Provides



@Module(

    includes =
@@ -38,11 +36,9 @@ import dagger.Provides 
            CommunalDatabaseModule::class,

        ]

)

class CommunalModule {

    @Provides

    fun provideEditWidgetsActivityStarter(

        @Application context: Context

    ): EditWidgetsActivityStarter {

        return EditWidgetsActivityStarterImpl(context)

    }

interface CommunalModule {

    @Binds

    fun bindEditWidgetsActivityStarter(

        starter: EditWidgetsActivityStarterImpl

    ): EditWidgetsActivityStarter

}

packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivityStarter.kt

+13 −4
Original line number Diff line number Diff line
@@ -19,17 +19,26 @@ package com.android.systemui.communal.widgets 
import android.content.Context

import android.content.Intent

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.plugins.ActivityStarter

import javax.inject.Inject



interface EditWidgetsActivityStarter {

    fun startActivity()

}



class EditWidgetsActivityStarterImpl(@Application private val applicationContext: Context) :

    EditWidgetsActivityStarter {

class EditWidgetsActivityStarterImpl

@Inject

constructor(

    @Application private val applicationContext: Context,

    private val activityStarter: ActivityStarter,

) : EditWidgetsActivityStarter {



    override fun startActivity() {

        applicationContext.startActivity(

        activityStarter.startActivityDismissingKeyguard(

            Intent(applicationContext, EditWidgetsActivity::class.java)

                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)

                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK),

            /* onlyProvisioned = */ true,

            /* dismissShade = */ true,

        )

    }

}