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

Unverified Commit 46eca017 authored by Michael Bestas's avatar Michael Bestas
Browse files

Revert "SystemUI: Use max Display.Mode in AuthController as well" 

Fixed in qpr1

This reverts commit c1d50567.

Change-Id: I7eaa46b9eba8cbff339cb8f975728673822c1b81
parent 0acc18a2

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

+9 −12
Original line number Diff line number Diff line
@@ -54,10 +54,8 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.RemoteException;

import android.os.UserManager;

import android.util.DisplayUtils;

import android.util.Log;

import android.util.SparseBooleanArray;

import android.view.Display;

import android.view.DisplayInfo;

import android.view.MotionEvent;

import android.view.WindowManager;
@@ -116,6 +114,8 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
    private final Provider<UdfpsController> mUdfpsControllerFactory;

    private final Provider<SidefpsController> mSidefpsControllerFactory;



    @NonNull private Point mStableDisplaySize = new Point();



    @Nullable private final PointF mFaceAuthSensorLocation;

    @Nullable private PointF mFingerprintLocation;

    @Nullable private Rect mUdfpsBounds;
@@ -489,11 +489,9 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
        }

        DisplayInfo displayInfo = new DisplayInfo();

        mContext.getDisplay().getDisplayInfo(displayInfo);

        final Display.Mode maxDisplayMode =

                DisplayUtils.getMaximumResolutionDisplayMode(displayInfo.supportedModes);

        final float scaleFactor = DisplayUtils.getPhysicalPixelDisplaySizeRatio(

                maxDisplayMode.getPhysicalWidth(), maxDisplayMode.getPhysicalHeight(),

                displayInfo.getNaturalWidth(), displayInfo.getNaturalHeight());

        final float scaleFactor = android.util.DisplayUtils.getPhysicalPixelDisplaySizeRatio(

                mStableDisplaySize.x, mStableDisplaySize.y, displayInfo.getNaturalWidth(),

                displayInfo.getNaturalHeight());

        if (scaleFactor == Float.POSITIVE_INFINITY) {

            return new PointF(mFaceAuthSensorLocation.x, mFaceAuthSensorLocation.y);

        }
@@ -646,11 +644,9 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
        if (mUdfpsController != null) {

            final DisplayInfo displayInfo = new DisplayInfo();

            mContext.getDisplay().getDisplayInfo(displayInfo);

            final Display.Mode maxDisplayMode =

                    DisplayUtils.getMaximumResolutionDisplayMode(displayInfo.supportedModes);

            final float scaleFactor = DisplayUtils.getPhysicalPixelDisplaySizeRatio(

                    maxDisplayMode.getPhysicalWidth(), maxDisplayMode.getPhysicalHeight(),

                    displayInfo.getNaturalWidth(), displayInfo.getNaturalHeight());

            final float scaleFactor = android.util.DisplayUtils.getPhysicalPixelDisplaySizeRatio(

                    mStableDisplaySize.x, mStableDisplaySize.y, displayInfo.getNaturalWidth(),

                    displayInfo.getNaturalHeight());



            final FingerprintSensorPropertiesInternal udfpsProp = mUdfpsProps.get(0);

            final Rect previousUdfpsBounds = mUdfpsBounds;
@@ -677,6 +673,7 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 
                    mFingerprintAuthenticatorsRegisteredCallback);

        }



        mStableDisplaySize = mDisplayManager.getStableDisplaySize();

        mActivityTaskManager.registerTaskStackListener(mTaskStackListener);

    }