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

Commit 05682a05 authored by Winson Chung's avatar Winson Chung
Browse files

Report gesture height for mandatory system gestures 

- We are currently reporting the content insets for the mandatory system
  gestures in taskbar, but for button nav we should actually be
  reporting zero, and for gesture nav we should either report the
  content height if the taskbar is pinned, or the gesture height
  otherwise as the bottom mandatory gesture inset

Bug: 340134342
Test: atest android.systemui.cts.WindowInsetsBehaviorTests
Change-Id: Ie4d56b62c903c273db95c19c9d34fcfe6c9ce486
parent 38ad424a

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

+18 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.launcher3.anim.AlphaUpdateListener 
import com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION

import com.android.launcher3.config.FeatureFlags.enableTaskbarNoRecreate

import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController

import com.android.launcher3.testing.shared.ResourceUtils

import com.android.launcher3.util.DisplayController

import java.io.PrintWriter

import kotlin.jvm.optionals.getOrNull
@@ -231,8 +232,24 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas 
        val contentHeight = controllers.taskbarStashController.contentHeightToReportToApps

        val tappableHeight = controllers.taskbarStashController.tappableHeightToReportToApps

        val res = context.resources

        if (provider.type == navigationBars() || provider.type == mandatorySystemGestures()) {

        if (provider.type == navigationBars()) {

            provider.insetsSize = getInsetsForGravityWithCutout(contentHeight, gravity, endRotation)

        } else if (provider.type == mandatorySystemGestures()) {

            if (context.isThreeButtonNav) {

                provider.insetsSize = Insets.of(0, 0, 0, 0)

            } else {

                val gestureHeight =

                        ResourceUtils.getNavbarSize(

                        ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE,

                        context.resources)

                val isPinnedTaskbar = context.deviceProfile.isTaskbarPresent

                        && !context.deviceProfile.isTransientTaskbar

                val mandatoryGestureHeight =

                        if (isPinnedTaskbar) contentHeight

                        else gestureHeight

                provider.insetsSize = getInsetsForGravityWithCutout(mandatoryGestureHeight, gravity,

                        endRotation)

            }

        } else if (provider.type == tappableElement()) {

            provider.insetsSize = getInsetsForGravity(tappableHeight, gravity)

        } else if (provider.type == systemGestures() && provider.index == INDEX_LEFT) {