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

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

Merge "Update margin / corners on BiometricDialog"

parents 6aceee0b bb269147

packages/SystemUI/res/drawable/biometric_dialog_bg.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
    <corners android:radius="1dp"

        android:topLeftRadius="@dimen/biometric_dialog_corner_size"

        android:topRightRadius="@dimen/biometric_dialog_corner_size"

        android:bottomLeftRadius="0dp"

        android:bottomRightRadius="0dp"/>

        android:bottomLeftRadius="@dimen/biometric_dialog_corner_size"

        android:bottomRightRadius="@dimen/biometric_dialog_corner_size"/>

</shape>

packages/SystemUI/res/layout/biometric_dialog.xml

+7 −4
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 


    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        android:layout_height="wrap_content"

        android:orientation="horizontal">



        <!-- This is not a Space since Spaces cannot be clicked. The width of this changes depending

         on horizontal/portrait orientation -->
@@ -43,11 +44,13 @@ 


        <LinearLayout

            android:id="@+id/dialog"

            android:layout_width="0dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:elevation="2dp"

            android:background="@drawable/biometric_dialog_bg">

            android:background="@drawable/biometric_dialog_bg"

            android:layout_marginBottom="@dimen/biometric_dialog_border_padding"

            android:layout_marginLeft="@dimen/biometric_dialog_border_padding"

            android:layout_marginRight="@dimen/biometric_dialog_border_padding">



            <TextView

                android:id="@+id/title"

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -889,6 +889,7 @@ 
    <dimen name="biometric_dialog_biometric_icon_size">64dp</dimen>

    <dimen name="biometric_dialog_corner_size">4dp</dimen>

    <dimen name="biometric_dialog_animation_translation_offset">350dp</dimen>

    <dimen name="biometric_dialog_border_padding">4dp</dimen>



    <!-- Wireless Charging Animation values -->

    <dimen name="wireless_charging_dots_radius_start">0dp</dimen>

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

+5 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.widget.TextView; 


import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.util.leak.RotationUtils;



/**

 * Abstract base class. Shows a dialog for BiometricPrompt.
@@ -199,7 +200,10 @@ public abstract class BiometricDialogView extends LinearLayout { 
        final Button negative = mLayout.findViewById(R.id.button2);

        final Button positive = mLayout.findViewById(R.id.button1);



        if (RotationUtils.getRotation(mContext) != RotationUtils.ROTATION_NONE) {

            mDialog.getLayoutParams().width = (int) mDialogWidth;

        }



        mLastState = STATE_NONE;

        updateState(STATE_AUTHENTICATING);