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

Commit ea389846 authored by Jesse Dai's avatar Jesse Dai Committed by Android (Google) Code Review
Browse files

Merge "Rename LockscreenLongPress to LockscreenTouchHandling" into main

parents 906a8301 046616d8

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenLongPress.kt→packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenTouchHandling.kt

+2 −3
Original line number Original line Diff line number Diff line
@@ -38,10 +38,9 @@ import com.android.systemui.communal.ui.compose.extensions.detectLongPressGestur 
import com.android.systemui.keyguard.ui.viewmodel.KeyguardTouchHandlingViewModel

import com.android.systemui.keyguard.ui.viewmodel.KeyguardTouchHandlingViewModel

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.lifecycle.rememberViewModel





/** Container for lockscreen content that handles long-press to bring up the settings menu. */

/** Container for lockscreen content that handles inputs including long-press and double tap. */

@Composable

@Composable

// TODO(b/344879669): now that it's more generic than long-press, rename it.

fun LockscreenTouchHandling(

fun LockscreenLongPress(

    viewModelFactory: KeyguardTouchHandlingViewModel.Factory,

    viewModelFactory: KeyguardTouchHandlingViewModel.Factory,

    modifier: Modifier = Modifier,

    modifier: Modifier = Modifier,

    content: @Composable BoxScope.(onSettingsMenuPlaces: (coordinates: Rect?) -> Unit) -> Unit,

    content: @Composable BoxScope.(onSettingsMenuPlaces: (coordinates: Rect?) -> Unit) -> Unit,

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/CommunalBlueprint.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ import androidx.compose.ui.Alignment 
import androidx.compose.ui.Modifier

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.graphics.Color

import com.android.compose.animation.scene.ContentScope

import com.android.compose.animation.scene.ContentScope

import com.android.systemui.keyguard.ui.composable.LockscreenLongPress

import com.android.systemui.keyguard.ui.composable.LockscreenTouchHandling

import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel

import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel

import dagger.Binds

import dagger.Binds

import dagger.Module

import dagger.Module
@@ -38,7 +38,7 @@ class CommunalBlueprint @Inject constructor() : ComposableLockscreenSceneBluepri 




    @Composable

    @Composable

    override fun ContentScope.Content(viewModel: LockscreenContentViewModel, modifier: Modifier) {

    override fun ContentScope.Content(viewModel: LockscreenContentViewModel, modifier: Modifier) {

        LockscreenLongPress(

        LockscreenTouchHandling(

            viewModelFactory = viewModel.touchHandlingFactory,

            viewModelFactory = viewModel.touchHandlingFactory,

            modifier = modifier,

            modifier = modifier,

        ) { _ ->

        ) { _ ->

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ import androidx.compose.ui.unit.dp 
import com.android.compose.animation.scene.ContentScope

import com.android.compose.animation.scene.ContentScope

import com.android.compose.modifiers.padding

import com.android.compose.modifiers.padding

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.keyguard.ui.composable.LockscreenLongPress

import com.android.systemui.keyguard.ui.composable.LockscreenTouchHandling

import com.android.systemui.keyguard.ui.composable.section.AmbientIndicationSection

import com.android.systemui.keyguard.ui.composable.section.AmbientIndicationSection

import com.android.systemui.keyguard.ui.composable.section.BottomAreaSection

import com.android.systemui.keyguard.ui.composable.section.BottomAreaSection

import com.android.systemui.keyguard.ui.composable.section.LockSection

import com.android.systemui.keyguard.ui.composable.section.LockSection
@@ -78,7 +78,7 @@ constructor( 
            with(notificationSection) { HeadsUpNotifications() }

            with(notificationSection) { HeadsUpNotifications() }

        }

        }





        LockscreenLongPress(

        LockscreenTouchHandling(

            viewModelFactory = viewModel.touchHandlingFactory,

            viewModelFactory = viewModel.touchHandlingFactory,

            modifier = modifier,

            modifier = modifier,

        ) { onSettingsMenuPlaced ->

        ) { onSettingsMenuPlaced ->