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

Commit 262d042c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-f6a213faf9b84559abf084f450185dfc" into sc-v2-dev-plus-aosp 

* changes:
  [automerge] DO NOT MERGE Transform UDFPS touch coordinates to portrait mode 2p: a9e20f2f
  DO NOT MERGE Transform UDFPS touch coordinates to portrait mode
parents 5a7a7495 635eeb22

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

+27 −2
Original line number Diff line number Diff line
@@ -480,8 +480,33 @@ public class UdfpsController implements DozeReceiver { 
                        final long sinceLastLog = mSystemClock.elapsedRealtime() - mTouchLogTime;

                        if (!isIlluminationRequested && !mGoodCaptureReceived &&

                                !exceedsVelocityThreshold) {

                            onFingerDown((int) event.getRawX(), (int) event.getRawY(), minor,

                                    major);

                            final int rawX = (int) event.getRawX();

                            final int rawY = (int) event.getRawY();

                            // Default coordinates assume portrait mode.

                            int x = rawX;

                            int y = rawY;



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

                            Point p = new Point();

                            mContext.getDisplay().getRealSize(p);



                            // Transform x, y to portrait mode if the device is in landscape mode.

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

                                case Surface.ROTATION_90:

                                    x = p.y - rawY;

                                    y = rawX;

                                    break;



                                case Surface.ROTATION_270:

                                    x = rawY;

                                    y = p.x - rawX;

                                    break;



                                default:

                                    // Do nothing to stay in portrait mode.

                            }



                            onFingerDown(x, y, minor, major);

                            Log.v(TAG, "onTouch | finger down: " + touchInfo);

                            mTouchLogTime = mSystemClock.elapsedRealtime();

                            mPowerManager.userActivity(mSystemClock.uptimeMillis(),