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

Merge "Do not use stableDisplaySize for scale factor" into tm-qpr-dev

Browse Source
This commit is contained in:
Beverly Tai
2022-09-20 12:34:44 +00:00
committed by Android (Google) Code Review
parent 668090c09b 54a7b623b1
commit fa561d3934
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
View File

@@ -56,6 +56,7 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserManager; import android.os.UserManager;
import android.util.DisplayUtils;
import android.util.Log; import android.util.Log;
import android.util.RotationUtils; import android.util.RotationUtils;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
@@ -118,8 +119,6 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba
private final Provider<UdfpsController> mUdfpsControllerFactory; private final Provider<UdfpsController> mUdfpsControllerFactory;
private final Provider<SidefpsController> mSidefpsControllerFactory; private final Provider<SidefpsController> mSidefpsControllerFactory;
@NonNull private Point mStableDisplaySize = new Point();
private final Display mDisplay; private final Display mDisplay;
private float mScaleFactor = 1f; private float mScaleFactor = 1f;
// sensor locations without any resolution scaling nor rotation adjustments: // sensor locations without any resolution scaling nor rotation adjustments:
@@ -508,10 +507,11 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba
*/ */
private void updateSensorLocations() { private void updateSensorLocations() {
mDisplay.getDisplayInfo(mCachedDisplayInfo); mDisplay.getDisplayInfo(mCachedDisplayInfo);
final Display.Mode maxDisplayMode =
DisplayUtils.getMaximumResolutionDisplayMode(mCachedDisplayInfo.supportedModes);
final float scaleFactor = android.util.DisplayUtils.getPhysicalPixelDisplaySizeRatio( final float scaleFactor = android.util.DisplayUtils.getPhysicalPixelDisplaySizeRatio(
mStableDisplaySize.x, mStableDisplaySize.y, mCachedDisplayInfo.getNaturalWidth(), maxDisplayMode.getPhysicalWidth(), maxDisplayMode.getPhysicalHeight(),
mCachedDisplayInfo.getNaturalHeight()); mCachedDisplayInfo.getNaturalWidth(), mCachedDisplayInfo.getNaturalHeight());
if (scaleFactor == Float.POSITIVE_INFINITY) { if (scaleFactor == Float.POSITIVE_INFINITY) {
mScaleFactor = 1f; mScaleFactor = 1f;
} else { } else {
@@ -768,7 +768,6 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba
mFingerprintAuthenticatorsRegisteredCallback); mFingerprintAuthenticatorsRegisteredCallback);
} }
mStableDisplaySize = mDisplayManager.getStableDisplaySize();
mActivityTaskManager.registerTaskStackListener(mTaskStackListener); mActivityTaskManager.registerTaskStackListener(mTaskStackListener);
mOrientationListener.enable(); mOrientationListener.enable();
updateSensorLocations(); updateSensorLocations();
@@ -1148,7 +1147,6 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba
@Override @Override
public void dump(@NonNull PrintWriter pw, @NonNull String[] args) { public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
final AuthDialog dialog = mCurrentDialog; final AuthDialog dialog = mCurrentDialog;
pw.println(" stableDisplaySize=" + mStableDisplaySize);
pw.println(" mCachedDisplayInfo=" + mCachedDisplayInfo); pw.println(" mCachedDisplayInfo=" + mCachedDisplayInfo);
pw.println(" mScaleFactor=" + mScaleFactor); pw.println(" mScaleFactor=" + mScaleFactor);
pw.println(" faceAuthSensorLocationDefault=" + mFaceSensorLocationDefault); pw.println(" faceAuthSensorLocationDefault=" + mFaceSensorLocationDefault);