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

Merge "Try to fix stale mDisplaySize" into tm-qpr-dev am: 6b55fa7144

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19276947

Change-Id: I90c4cdee602044ff5ee8bf22a35b8fb3119f3274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-07-13 22:46:26 +00:00
committed by Automerger Merge Worker
parent 0845453dcc 6b55fa7144
commit 900910e2af
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
View File

@@ -53,7 +53,6 @@ import android.view.MotionEvent;
import android.view.Surface; import android.view.Surface;
import android.view.ViewConfiguration; import android.view.ViewConfiguration;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.WindowMetrics;
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
import com.android.internal.policy.GestureNavigationSettingsObserver; import com.android.internal.policy.GestureNavigationSettingsObserver;
@@ -183,6 +182,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
private final IWindowManager mWindowManagerService; private final IWindowManager mWindowManagerService;
private final Optional<Pip> mPipOptional; private final Optional<Pip> mPipOptional;
private final FalsingManager mFalsingManager; private final FalsingManager mFalsingManager;
private final Configuration mLastReportedConfig = new Configuration();
// Activities which should not trigger Back gesture. // Activities which should not trigger Back gesture.
private final List<ComponentName> mGestureBlockingActivities = new ArrayList<>(); private final List<ComponentName> mGestureBlockingActivities = new ArrayList<>();
@@ -338,6 +338,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
mLatencyTracker = latencyTracker; mLatencyTracker = latencyTracker;
mBackGestureTfClassifierProviderProvider = backGestureTfClassifierProviderProvider; mBackGestureTfClassifierProviderProvider = backGestureTfClassifierProviderProvider;
mFeatureFlags = featureFlags; mFeatureFlags = featureFlags;
mLastReportedConfig.setTo(mContext.getResources().getConfiguration());
ComponentName recentsComponentName = ComponentName.unflattenFromString( ComponentName recentsComponentName = ComponentName.unflattenFromString(
context.getString(com.android.internal.R.string.config_recentsComponentName)); context.getString(com.android.internal.R.string.config_recentsComponentName));
if (recentsComponentName != null) { if (recentsComponentName != null) {
@@ -886,12 +887,12 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
if (DEBUG_MISSING_GESTURE) { if (DEBUG_MISSING_GESTURE) {
Log.d(DEBUG_MISSING_GESTURE_TAG, "Config changed: config=" + newConfig); Log.d(DEBUG_MISSING_GESTURE_TAG, "Config changed: config=" + newConfig);
} }
mLastReportedConfig.updateFrom(newConfig);
updateDisplaySize(); updateDisplaySize();
} }
private void updateDisplaySize() { private void updateDisplaySize() {
WindowMetrics metrics = mWindowManager.getMaximumWindowMetrics(); Rect bounds = mLastReportedConfig.windowConfiguration.getMaxBounds();
Rect bounds = metrics.getBounds();
mDisplaySize.set(bounds.width(), bounds.height()); mDisplaySize.set(bounds.width(), bounds.height());
if (DEBUG_MISSING_GESTURE) { if (DEBUG_MISSING_GESTURE) {
Log.d(DEBUG_MISSING_GESTURE_TAG, "Update display size: mDisplaySize=" + mDisplaySize); Log.d(DEBUG_MISSING_GESTURE_TAG, "Update display size: mDisplaySize=" + mDisplaySize);