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

Commit 4c5ad623 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 am: 7d904997 

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

Change-Id: I20b6cd2928752765bffb6c30012a3750b1199f53
parents c7fc1dfe 7d904997

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

+8 −1
Original line number Original line 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.

        // Gets the size based on the current rotation of the display.

        mContext.getDisplay().getRealSize(p);

        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()) {

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

            case Surface.ROTATION_90:

            case Surface.ROTATION_90:

                if (animation instanceof UdfpsKeyguardViewController) {

                    break;

                }

                mCoreLayoutParams.x = mSensorProps.sensorLocationY - mSensorProps.sensorRadius

                mCoreLayoutParams.x = mSensorProps.sensorLocationY - mSensorProps.sensorRadius

                        - paddingX;

                        - paddingX;

                mCoreLayoutParams.y = p.y - mSensorProps.sensorLocationX - mSensorProps.sensorRadius

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

                break;





            case Surface.ROTATION_270:

            case Surface.ROTATION_270:

                if (animation instanceof UdfpsKeyguardViewController) {

                    break;

                }

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

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

                        - paddingX;

                        - paddingX;

                mCoreLayoutParams.y = mSensorProps.sensorLocationX - mSensorProps.sensorRadius

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




            default:

            default:

                // Do nothing to stay in portrait mode.

                // Do nothing to stay in portrait mode.

                // Keyguard is always in portrait mode.

        }

        }

        // avoid announcing window title

        // avoid announcing window title

        mCoreLayoutParams.accessibilityTitle = " ";

        mCoreLayoutParams.accessibilityTitle = " ";