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

Commit e2daf2c1 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Only call per-user calls for gesture settings observer" into tm-qpr-dev... 

Merge "Only call per-user calls for gesture settings observer" into tm-qpr-dev am: 192e7afc am: 785f15d9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21459072



Change-Id: Ic26e7bcd72b26c44f6e313321e0c5c120121961a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc7fc9f5 785f15d9

quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt

+4 −3
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas 


        windowLayoutParams.insetsRoundedCornerFrame = true

        context.addOnDeviceProfileChangeListener(deviceProfileChangeListener)

        gestureNavSettingsObserver.registerForCurrentUser()

        gestureNavSettingsObserver.registerForCallingUser()

    }



    fun onDestroy() {
@@ -102,6 +102,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas 
        )

        val contentHeight = controllers.taskbarStashController.contentHeightToReportToApps

        val tappableHeight = controllers.taskbarStashController.tappableHeightToReportToApps

        val res = context.resources;

        for (provider in windowLayoutParams.providedInsets) {

            if (

                provider.type == ITYPE_EXTRA_NAVIGATION_BAR ||
@@ -113,7 +114,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas 
            } else if (provider.type == ITYPE_LEFT_GESTURES) {

                provider.insetsSize =

                    Insets.of(

                        gestureNavSettingsObserver.getLeftSensitivity(context.resources),

                        gestureNavSettingsObserver.getLeftSensitivityForCallingUser(res),

                        0,

                        0,

                        0
@@ -123,7 +124,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas 
                    Insets.of(

                        0,

                        0,

                        gestureNavSettingsObserver.getRightSensitivity(context.resources),

                        gestureNavSettingsObserver.getRightSensitivityForCallingUser(res),

                        0

                    )

            }