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

Commit 62db716f authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Take optional fields into consideration when measuring"

parents 503bdc29 c2ea8f26

packages/SystemUI/res/layout/auth_biometric_contents.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,6 @@ 
        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:paddingHorizontal="24dp"

        android:paddingHorizontal="24dp"

        android:paddingBottom="48dp"

        android:paddingTop="8dp"

        android:paddingTop="8dp"

        android:gravity="@integer/biometric_dialog_text_gravity"

        android:gravity="@integer/biometric_dialog_text_gravity"

        android:textSize="16sp"

        android:textSize="16sp"
@@ -52,6 +51,7 @@ 
        android:id="@+id/biometric_icon"

        android:id="@+id/biometric_icon"

        android:layout_width="@dimen/biometric_dialog_biometric_icon_size"

        android:layout_width="@dimen/biometric_dialog_biometric_icon_size"

        android:layout_height="@dimen/biometric_dialog_biometric_icon_size"

        android:layout_height="@dimen/biometric_dialog_biometric_icon_size"

        android:paddingTop="48dp"

        android:layout_gravity="center_horizontal"

        android:layout_gravity="center_horizontal"

        android:scaleType="fitXY" />

        android:scaleType="fitXY" />

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -608,8 +608,11 @@ public abstract class AuthBiometricView extends LinearLayout { 
                        MeasureSpec.makeMeasureSpec(newWidth, MeasureSpec.EXACTLY),

                        MeasureSpec.makeMeasureSpec(newWidth, MeasureSpec.EXACTLY),

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

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

            }

            }



            if (child.getVisibility() != View.GONE) {

                totalHeight += child.getMeasuredHeight();

                totalHeight += child.getMeasuredHeight();

            }

            }

        }





        // Use the new width so it's centered horizontally

        // Use the new width so it's centered horizontally

        setMeasuredDimension(newWidth, totalHeight);

        setMeasuredDimension(newWidth, totalHeight);