Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Collapse shade when opening controls activities" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-19 19:56:47 +00:00
committed by Android (Google) Code Review
parent 2fed0a734e 5e6be9e7ae
commit f843c6c05e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt
View File

@@ -59,6 +59,7 @@ import com.android.systemui.dagger.qualifiers.Background
import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.globalactions.GlobalActionsPopupMenu import com.android.systemui.globalactions.GlobalActionsPopupMenu
import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.ActivityStarter
import com.android.systemui.statusbar.phone.ShadeController
import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.statusbar.policy.KeyguardStateController
import com.android.systemui.util.concurrency.DelayableExecutor import com.android.systemui.util.concurrency.DelayableExecutor
import dagger.Lazy import dagger.Lazy
@@ -79,7 +80,8 @@ class ControlsUiControllerImpl @Inject constructor (
@Main val sharedPreferences: SharedPreferences, @Main val sharedPreferences: SharedPreferences,
val controlActionCoordinator: ControlActionCoordinator, val controlActionCoordinator: ControlActionCoordinator,
private val activityStarter: ActivityStarter, private val activityStarter: ActivityStarter,
private val keyguardStateController: KeyguardStateController private val keyguardStateController: KeyguardStateController,
private val shadeController: ShadeController
) : ControlsUiController { ) : ControlsUiController {
companion object { companion object {
@@ -254,14 +256,11 @@ class ControlsUiControllerImpl @Inject constructor (
intent.putExtra(ControlsUiController.EXTRA_ANIMATE, true) intent.putExtra(ControlsUiController.EXTRA_ANIMATE, true)
dismissGlobalActions.run() dismissGlobalActions.run()
if (!keyguardStateController.isUnlocked()) { activityStarter.dismissKeyguardThenExecute({
activityStarter.dismissKeyguardThenExecute({ shadeController.collapsePanel(false)
context.startActivity(intent)
true
}, null, true)
} else {
context.startActivity(intent) context.startActivity(intent)
} true
}, null, true)
} }
private fun showControlsView(items: List<SelectionItem>) { private fun showControlsView(items: List<SelectionItem>) {