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

Commit 7d904997 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Always show fp icon in portrait on keyguard" into sc-dev am: fdf2bc97 

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

Change-Id: I8980d4eff87f3bb5e8d2da0db329da14622c7cc8
parents 082db306 fdf2bc97

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

+8 −1
Original line number Diff line number Diff line
@@ -636,9 +636,12 @@ public class UdfpsController implements DozeReceiver { 
        // Gets the size based on the current rotation of the display.

        mContext.getDisplay().getRealSize(p);



        // Transform dimensions if the device is in landscape mode.

        // Transform dimensions if the device is in landscape mode

        switch (mContext.getDisplay().getRotation()) {

            case Surface.ROTATION_90:

                if (animation instanceof UdfpsKeyguardViewController) {

                    break;

                }

                mCoreLayoutParams.x = mSensorProps.sensorLocationY - mSensorProps.sensorRadius

                        - paddingX;

                mCoreLayoutParams.y = p.y - mSensorProps.sensorLocationX - mSensorProps.sensorRadius
@@ -646,6 +649,9 @@ public class UdfpsController implements DozeReceiver { 
                break;



            case Surface.ROTATION_270:

                if (animation instanceof UdfpsKeyguardViewController) {

                    break;

                }

                mCoreLayoutParams.x = p.x - mSensorProps.sensorLocationY - mSensorProps.sensorRadius

                        - paddingX;

                mCoreLayoutParams.y = mSensorProps.sensorLocationX - mSensorProps.sensorRadius
@@ -654,6 +660,7 @@ public class UdfpsController implements DozeReceiver { 


            default:

                // Do nothing to stay in portrait mode.

                // Keyguard is always in portrait mode.

        }

        // avoid announcing window title

        mCoreLayoutParams.accessibilityTitle = " ";