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

Commit 900910e2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I90c4cdee602044ff5ee8bf22a35b8fb3119f3274
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0845453d 6b55fa71

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

+4 −3
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import android.view.MotionEvent; 
import android.view.Surface;

import android.view.ViewConfiguration;

import android.view.WindowManager;

import android.view.WindowMetrics;



import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;

import com.android.internal.policy.GestureNavigationSettingsObserver;
@@ -183,6 +182,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
    private final IWindowManager mWindowManagerService;

    private final Optional<Pip> mPipOptional;

    private final FalsingManager mFalsingManager;

    private final Configuration mLastReportedConfig = new Configuration();

    // Activities which should not trigger Back gesture.

    private final List<ComponentName> mGestureBlockingActivities = new ArrayList<>();
@@ -338,6 +338,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
        mLatencyTracker = latencyTracker;

        mBackGestureTfClassifierProviderProvider = backGestureTfClassifierProviderProvider;

        mFeatureFlags = featureFlags;

        mLastReportedConfig.setTo(mContext.getResources().getConfiguration());

        ComponentName recentsComponentName = ComponentName.unflattenFromString(

                context.getString(com.android.internal.R.string.config_recentsComponentName));

        if (recentsComponentName != null) {
@@ -886,12 +887,12 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
        if (DEBUG_MISSING_GESTURE) {

            Log.d(DEBUG_MISSING_GESTURE_TAG, "Config changed: config=" + newConfig);

        }

        mLastReportedConfig.updateFrom(newConfig);

        updateDisplaySize();

    }



    private void updateDisplaySize() {

        WindowMetrics metrics = mWindowManager.getMaximumWindowMetrics();

        Rect bounds = metrics.getBounds();

        Rect bounds = mLastReportedConfig.windowConfiguration.getMaxBounds();

        mDisplaySize.set(bounds.width(), bounds.height());

        if (DEBUG_MISSING_GESTURE) {

            Log.d(DEBUG_MISSING_GESTURE_TAG, "Update display size: mDisplaySize=" + mDisplaySize);