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

Commit 2b72d888 authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

Removing remaining pieces of action key tutorial from touchpad tutorial 

This also fixes issue with keyboard shortcuts being disabled in touchpad tutorial

Fixes: 365752281
Fixes: 358105049
Flag: com.android.systemui.shared.new_touchpad_gestures_tutorial
Test: code compiles and TouchpadTutorialActivity can be launched
Test: keyboard shortcuts can be used while TouchpadTutorialActivity is active
Change-Id: I955be164ad469bae47a5e6b0aadcd755b6a78818
parent b661f7b9

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

+0 −8
Original line number Diff line number Diff line
@@ -29,12 +29,10 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle 
import com.android.compose.theme.PlatformTheme

import com.android.systemui.inputdevice.tutorial.InputDeviceTutorialLogger

import com.android.systemui.inputdevice.tutorial.InputDeviceTutorialLogger.TutorialContext

import com.android.systemui.inputdevice.tutorial.ui.composable.ActionKeyTutorialScreen

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

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

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

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

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

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.RECENT_APPS_GESTURE
@@ -59,7 +57,6 @@ constructor( 
        }

        // required to handle 3+ fingers on touchpad

        window.addPrivateFlags(WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY)

        window.addPrivateFlags(WindowManager.LayoutParams.PRIVATE_FLAG_ALLOW_ACTION_KEY_EVENTS)

    }



    private fun finishTutorial() {
@@ -104,10 +101,5 @@ fun TouchpadTutorialScreen(vm: TouchpadTutorialViewModel, closeTutorial: () -> U 
                onDoneButtonClicked = { vm.goTo(TUTORIAL_SELECTION) },

                onBack = { vm.goTo(TUTORIAL_SELECTION) },

            )

        ACTION_KEY -> // TODO(b/358105049) move action key tutorial to OOBE flow

        ActionKeyTutorialScreen(

                onDoneButtonClicked = { vm.goTo(TUTORIAL_SELECTION) },

                onBack = { vm.goTo(TUTORIAL_SELECTION) },

            )

    }

}

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

+0 −1
Original line number Diff line number Diff line
@@ -65,5 +65,4 @@ enum class Screen { 
    BACK_GESTURE,

    HOME_GESTURE,

    RECENT_APPS_GESTURE,

    ACTION_KEY,

}