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

Commit f5e475ca authored by Hao Dong's avatar Hao Dong Committed by Android (Google) Code Review
Browse files

Merge "Fix biometric prompt style." into main

parents 57562163 22c807a6

packages/SystemUI/res/layout-land/auth_credential_password_pin_content_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 


    <Button

        android:id="@+id/emergencyCallButton"

        style="@style/AuthCredentialEmergencyButtonStyle"

        style="@style/AuthNonBioCredentialEmergencyButtonStyle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:visibility="gone"

packages/SystemUI/res/layout-land/auth_credential_pattern_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 


        <Button

            android:id="@+id/emergencyCallButton"

            style="@style/AuthCredentialEmergencyButtonStyle"

            style="@style/AuthNonBioCredentialEmergencyButtonStyle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="35dp"

packages/SystemUI/res/layout-land/biometric_prompt_constraint_layout.xml

+1 −4
Original line number Diff line number Diff line
@@ -19,12 +19,9 @@ android:layout_height="match_parent"> 


    <View

        android:id="@+id/panel"

        style="@style/AuthCredentialPanelStyle"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:background="?androidprv:attr/materialColorSurfaceBright"

        android:clickable="true"

        android:clipToOutline="true"

        android:importantForAccessibility="no"

        android:paddingHorizontal="16dp"

        android:paddingVertical="16dp"

        android:visibility="visible"

packages/SystemUI/res/layout-sw600dp/biometric_prompt_constraint_layout.xml

+1 −5
Original line number Diff line number Diff line
@@ -19,13 +19,9 @@ 


    <View

        android:id="@+id/panel"

        style="@style/AuthCredentialPanelStyle"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:background="?androidprv:attr/materialColorSurfaceBright"

        android:clickable="true"

        android:clipToOutline="true"

        android:importantForAccessibility="no"

        android:visibility="visible"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/rightGuideline"

        app:layout_constraintStart_toStartOf="@+id/leftGuideline"

packages/SystemUI/res/layout/auth_container_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  -->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:id="@+id/layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent">
@@ -29,7 +30,7 @@ 
        android:id="@+id/panel"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="?android:attr/colorBackgroundFloating"

        android:background="?androidprv:attr/materialColorSurfaceContainer"

        android:elevation="@dimen/biometric_dialog_elevation"/>



    <ScrollView