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

Commit 7dbf80fe authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing packages in touchpad tutorial" into main

parents 05d1d08f e9227f21

packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/view/BackGestureTutorialScreen.kt→packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/BackGestureTutorialScreen.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.touchpad.tutorial.ui.view

package com.android.systemui.touchpad.tutorial.ui.composable



import androidx.activity.compose.BackHandler

import androidx.annotation.StringRes

packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/view/TutorialComponents.kt→packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/TutorialComponents.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.touchpad.tutorial.ui.view

package com.android.systemui.touchpad.tutorial.ui.composable



import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Row

packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/view/TutorialSelectionScreen.kt→packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/TutorialSelectionScreen.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.touchpad.tutorial.ui.view

package com.android.systemui.touchpad.tutorial.ui.composable



import androidx.compose.foundation.background

import androidx.compose.foundation.layout.Arrangement

packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/view/TouchpadTutorialActivity.kt

+6 −4
Original line number Diff line number Diff line
@@ -27,10 +27,12 @@ import androidx.compose.runtime.getValue 
import androidx.lifecycle.Lifecycle.State.STARTED

import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.compose.theme.PlatformTheme

import com.android.systemui.touchpad.tutorial.ui.Screen.BACK_GESTURE

import com.android.systemui.touchpad.tutorial.ui.Screen.HOME_GESTURE

import com.android.systemui.touchpad.tutorial.ui.Screen.TUTORIAL_SELECTION

import com.android.systemui.touchpad.tutorial.ui.TouchpadTutorialViewModel

import com.android.systemui.touchpad.tutorial.ui.composable.BackGestureTutorialScreen

import com.android.systemui.touchpad.tutorial.ui.composable.TutorialSelectionScreen

import com.android.systemui.touchpad.tutorial.ui.viewmodel.Screen.BACK_GESTURE

import com.android.systemui.touchpad.tutorial.ui.viewmodel.Screen.HOME_GESTURE

import com.android.systemui.touchpad.tutorial.ui.viewmodel.Screen.TUTORIAL_SELECTION

import com.android.systemui.touchpad.tutorial.ui.viewmodel.TouchpadTutorialViewModel

import javax.inject.Inject



class TouchpadTutorialActivity

packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/TouchpadTutorialViewModel.kt→packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/viewmodel/TouchpadTutorialViewModel.kt

+2 −2
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ 
 * limitations under the License.

 */



package com.android.systemui.touchpad.tutorial.ui

package com.android.systemui.touchpad.tutorial.ui.viewmodel



import androidx.lifecycle.ViewModel

import androidx.lifecycle.ViewModelProvider

import com.android.systemui.touchpad.tutorial.domain.interactor.TouchpadGesturesInteractor

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.StateFlow

import javax.inject.Inject



class TouchpadTutorialViewModel(private val gesturesInteractor: TouchpadGesturesInteractor) :

    ViewModel() {