mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-03 17:36:49 +00:00
Merge "Allow touches on transient taskbar if ime is present." into tm-qpr-dev am: 912e6dd64d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20544543 Change-Id: I783620f7e1644d344fc66f59cb78a88dfc9b3488 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -149,7 +149,8 @@ class TaskbarInsetsController(val context: TaskbarActivityContext): LoggableTask
|
||||
if (context.dragLayer.alpha < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) {
|
||||
// Let touches pass through us.
|
||||
insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION)
|
||||
} else if (controllers.navbarButtonsViewController.isImeVisible) {
|
||||
} else if (controllers.navbarButtonsViewController.isImeVisible
|
||||
&& controllers.taskbarStashController.isStashed()) {
|
||||
insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION)
|
||||
} else if (!controllers.uiController.isTaskbarTouchable) {
|
||||
// Let touches pass through us.
|
||||
|
||||
@@ -193,7 +193,8 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
|
||||
* Should be called when the IME visibility changes, so we can make Taskbar not steal touches.
|
||||
*/
|
||||
public void setImeIsVisible(boolean isImeVisible) {
|
||||
mTaskbarView.setTouchesEnabled(!isImeVisible);
|
||||
mTaskbarView.setTouchesEnabled(!isImeVisible
|
||||
|| DisplayController.isTransientTaskbar(mActivity));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user