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

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

Merge "Fix credential view panel color and input field moving up." into main

parents 8203adb3 fa94302a

packages/SystemUI/res/layout/auth_container_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 


    <View

        android:id="@+id/panel"

        style="@style/AuthNonCredentialPanelStyle"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

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

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



    <ScrollView

packages/SystemUI/res/values/styles.xml

+4 −1
Original line number Diff line number Diff line
@@ -338,8 +338,11 @@ 
        <item name="android:textSize">16sp</item>

    </style>



    <style name="AuthCredentialPanelStyle">

    <style name="AuthNonCredentialPanelStyle">

        <item name="android:background">?androidprv:attr/materialColorSurfaceBright</item>

    </style>



    <style name="AuthCredentialPanelStyle" parent="AuthNonCredentialPanelStyle">

        <item name="android:clickable">true</item>

        <item name="android:clipToOutline">true</item>

        <item name="android:importantForAccessibility">no</item>

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

+3 −1
Original line number Diff line number Diff line
@@ -515,7 +515,9 @@ public class AuthContainerView extends LinearLayout 
        } else {

            throw new IllegalStateException("Unknown credential type: " + credentialType);

        }

        mCredentialView = factory.inflate(layoutResourceId, null, false);

        // TODO(b/288175645): Once AuthContainerView is removed, set 0dp in credential view xml

        //  files with the corresponding left/right or top/bottom constraints being set to "parent".

        mCredentialView = factory.inflate(layoutResourceId, mLayout, false);



        // The background is used for detecting taps / cancelling authentication. Since the

        // credential view is full-screen and should not be canceled from background taps,