Taskbar: use ENABLE_HIDE_IME_CAPTION_BAR
With ENABLE_HIDE_IME_CAPTION_BAR, we no longer need to update the navigation bar override. This was already applied for the navigation bar, but not the task bar. Mirrors the NavigationBar.java change in I8793db69fb846046300d5a56b3b0060138ef4cd5. Bug: 289748734 Change-Id: I86079cb6670a2ae3b6fa883694f8af81df212408 Test: presubmit
This commit is contained in:
1 parent
a5f24d709e
commit
f45ebad9be
1 file changed
+13
-6
@@ -15,6 +15,7 @@
|
||||
*/
|
||||
package com.android.launcher3.taskbar
|
||||
|
||||
import android.inputmethodservice.InputMethodService.ENABLE_HIDE_IME_CAPTION_BAR
|
||||
import android.graphics.Insets
|
||||
import android.graphics.Region
|
||||
import android.os.Binder
|
||||
@@ -198,16 +199,22 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas
|
||||
|
||||
val imeInsetsSize = getInsetsForGravity(taskbarHeightForIme, gravity)
|
||||
val imeInsetsSizeOverride =
|
||||
arrayOf(
|
||||
InsetsFrameProvider.InsetsSizeOverride(TYPE_INPUT_METHOD, imeInsetsSize),
|
||||
)
|
||||
if (!ENABLE_HIDE_IME_CAPTION_BAR) {
|
||||
arrayOf(
|
||||
InsetsFrameProvider.InsetsSizeOverride(
|
||||
TYPE_INPUT_METHOD,
|
||||
imeInsetsSize
|
||||
),
|
||||
)
|
||||
} else {
|
||||
arrayOf()
|
||||
}
|
||||
// Use 0 tappableElement insets for the VoiceInteractionWindow when gesture nav is enabled.
|
||||
val visInsetsSizeForTappableElement =
|
||||
if (context.isGestureNav) getInsetsForGravity(0, gravity)
|
||||
else getInsetsForGravity(tappableHeight, gravity)
|
||||
val insetsSizeOverrideForTappableElement =
|
||||
arrayOf(
|
||||
InsetsFrameProvider.InsetsSizeOverride(TYPE_INPUT_METHOD, imeInsetsSize),
|
||||
imeInsetsSizeOverride + arrayOf(
|
||||
InsetsFrameProvider.InsetsSizeOverride(
|
||||
TYPE_VOICE_INTERACTION,
|
||||
visInsetsSizeForTappableElement
|
||||
@@ -216,7 +223,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas
|
||||
if ((context.isGestureNav || TaskbarManager.FLAG_HIDE_NAVBAR_WINDOW)
|
||||
&& provider.type == tappableElement()) {
|
||||
provider.insetsSizeOverrides = insetsSizeOverrideForTappableElement
|
||||
} else if (provider.type != systemGestures()) {
|
||||
} else if (provider.type != systemGestures() && imeInsetsSizeOverride.isNotEmpty()) {
|
||||
// We only override insets at the bottom of the screen
|
||||
provider.insetsSizeOverrides = imeInsetsSizeOverride
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user