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

Commit 1ea91444 authored by Vincent Wang's avatar Vincent Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix circle is cut off in BiometricPrompt" into tm-dev am: c9e086ad am: ca051697 

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



Change-Id: I680d7dac25fda607f493d48a32aedfb651de6ee1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01bc8178 ca051697

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

+9 −11
Original line number Diff line number Diff line
@@ -112,17 +112,16 @@ public class UdfpsDialogMeasureAdapter { 
            if (child.getId() == R.id.biometric_icon_frame) {

                final FrameLayout iconFrame = (FrameLayout) child;

                final View icon = iconFrame.getChildAt(0);



                // Ensure that the icon is never larger than the sensor.

                icon.measure(

                        MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST),

                        MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST));



                // Create a frame that's exactly the height of the sensor circle.

                iconFrame.measure(

                        MeasureSpec.makeMeasureSpec(

                                child.getLayoutParams().width, MeasureSpec.EXACTLY),

                        MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.EXACTLY));



                // Ensure that the icon is never larger than the sensor.

                icon.measure(

                        MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST),

                        MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST));

            } else if (child.getId() == R.id.space_above_icon) {

                child.measure(

                        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
@@ -208,16 +207,15 @@ public class UdfpsDialogMeasureAdapter { 
            if (child.getId() == R.id.biometric_icon_frame) {

                final FrameLayout iconFrame = (FrameLayout) child;

                final View icon = iconFrame.getChildAt(0);

                // Create a frame that's exactly the height of the sensor circle.

                iconFrame.measure(

                        MeasureSpec.makeMeasureSpec(remeasuredWidth, MeasureSpec.EXACTLY),

                        MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.EXACTLY));



                // Ensure that the icon is never larger than the sensor.

                icon.measure(

                        MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST),

                        MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST));



                // Create a frame that's exactly the height of the sensor circle.

                iconFrame.measure(

                        MeasureSpec.makeMeasureSpec(remeasuredWidth, MeasureSpec.EXACTLY),

                        MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.EXACTLY));

            } else if (child.getId() == R.id.space_above_icon) {

                // Adjust the width and height of the top spacer if necessary.

                final int newTopSpacerHeight = child.getLayoutParams().height