Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue with system gesture areas being too large" into sc-dev

Browse Source
This commit is contained in:
Winson Chung
2021-06-02 16:50:57 +00:00
committed by Android (Google) Code Review
parent 81cac3a9f1 5616af887e
commit 7a2b7fc43f
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -1453,8 +1453,7 @@ public class DisplayPolicy {
} }
void onDisplayInfoChanged(DisplayInfo info) { void onDisplayInfoChanged(DisplayInfo info) {
mSystemGestures.screenWidth = info.logicalWidth; mSystemGestures.onDisplayInfoChanged(info);
mSystemGestures.screenHeight = info.logicalHeight;
} }
private void layoutStatusBar(DisplayFrames displayFrames, Rect contentFrame) { private void layoutStatusBar(DisplayFrames displayFrames, Rect contentFrame) {

18
services/core/java/com/android/server/wm/SystemGesturesPointerEventListener.java
View File

@@ -17,6 +17,7 @@
package com.android.server.wm; package com.android.server.wm;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.Region; import android.graphics.Region;
import android.hardware.display.DisplayManagerGlobal; import android.hardware.display.DisplayManagerGlobal;
@@ -65,6 +66,7 @@ class SystemGesturesPointerEventListener implements PointerEventListener {
int screenHeight; int screenHeight;
int screenWidth; int screenWidth;
private DisplayInfo mTmpDisplayInfo = new DisplayInfo();
private int mDownPointers; private int mDownPointers;
private boolean mSwipeFireable; private boolean mSwipeFireable;
private boolean mDebugFireable; private boolean mDebugFireable;
@@ -75,23 +77,31 @@ class SystemGesturesPointerEventListener implements PointerEventListener {
mContext = checkNull("context", context); mContext = checkNull("context", context);
mHandler = handler; mHandler = handler;
mCallbacks = checkNull("callbacks", callbacks); mCallbacks = checkNull("callbacks", callbacks);
onConfigurationChanged();
}
void onDisplayInfoChanged(DisplayInfo info) {
screenWidth = info.logicalWidth;
screenHeight = info.logicalHeight;
onConfigurationChanged(); onConfigurationChanged();
} }
void onConfigurationChanged() { void onConfigurationChanged() {
mSwipeStartThreshold = mContext.getResources() final Resources r = mContext.getResources();
.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
final Display display = DisplayManagerGlobal.getInstance() final Display display = DisplayManagerGlobal.getInstance()
.getRealDisplay(Display.DEFAULT_DISPLAY); .getRealDisplay(Display.DEFAULT_DISPLAY);
display.getDisplayInfo(mTmpDisplayInfo);
mSwipeStartThreshold = mTmpDisplayInfo.logicalWidth > mTmpDisplayInfo.logicalHeight
? r.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height_landscape)
: r.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height_portrait);
final DisplayCutout displayCutout = display.getCutout(); final DisplayCutout displayCutout = display.getCutout();
if (displayCutout != null) { if (displayCutout != null) {
final Rect bounds = displayCutout.getBoundingRectTop(); final Rect bounds = displayCutout.getBoundingRectTop();
if (!bounds.isEmpty()) { if (!bounds.isEmpty()) {
// Expand swipe start threshold such that we can catch touches that just start below // Expand swipe start threshold such that we can catch touches that just start below
// the notch area // the notch area
mDisplayCutoutTouchableRegionSize = mContext.getResources().getDimensionPixelSize( mDisplayCutoutTouchableRegionSize = r.getDimensionPixelSize(
com.android.internal.R.dimen.display_cutout_touchable_region_size); com.android.internal.R.dimen.display_cutout_touchable_region_size);
mSwipeStartThreshold += mDisplayCutoutTouchableRegionSize; mSwipeStartThreshold += mDisplayCutoutTouchableRegionSize;
} }