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

Commit 6c6d7187 authored by Austin Delgado's avatar Austin Delgado Committed by Android (Google) Code Review
Browse files

Merge "Credential view fallback options" into main

parents 4b5da2e1 12c81191

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/ui/viewmodel/CredentialViewModelTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import com.android.systemui.biometrics.data.repository.FakePromptRepository 
import com.android.systemui.biometrics.domain.interactor.CredentialStatus

import com.android.systemui.biometrics.domain.interactor.FakeCredentialInteractor

import com.android.systemui.biometrics.domain.interactor.PromptCredentialInteractor

import com.android.systemui.biometrics.domain.interactor.promptSelectorInteractor

import com.android.systemui.biometrics.promptInfo

import com.android.systemui.biometrics.shared.model.PromptKind

import com.android.systemui.shade.domain.interactor.shadeInteractor
@@ -45,6 +46,7 @@ class CredentialViewModelTest : SysuiTestCase() { 
                mContext,

                PromptCredentialInteractor(dispatcher, promptRepository, credentialInteractor),

                kosmos.shadeInteractor,

                kosmos.promptSelectorInteractor,

            )

    }

packages/SystemUI/res/drawable/auth_credential_fallback_button_background.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

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

    <shape android:shape="rectangle">

        <corners android:radius="25dp"/>

        <solid android:color="@androidprv:color/materialColorSecondaryContainer" />

    </shape>

</inset>

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

+7 −0
Original line number Diff line number Diff line
@@ -62,6 +62,13 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content" />



    <Button

        android:id="@+id/fallback_button"

        style="@style/AuthNonBioCredentialFallbackButtonStyle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_below="@id/description"

        android:visibility="gone" />

  </RelativeLayout>



  <FrameLayout

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

+8 −0
Original line number Diff line number Diff line
@@ -69,6 +69,14 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



        <Button

            android:id="@+id/fallback_button"

            style="@style/AuthNonBioCredentialFallbackButtonStyle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@id/description"

            android:visibility="gone" />



        <TextView

            android:id="@+id/error"

            style="?errorTextAppearanceLand"

packages/SystemUI/res/layout/auth_credential_password_pin_content_view.xml

+8 −0
Original line number Diff line number Diff line
@@ -62,6 +62,14 @@ 
          android:layout_below="@id/subtitle"

          android:layout_width="match_parent"

          android:layout_height="wrap_content" />



      <Button

          android:id="@+id/fallback_button"

          style="@style/AuthNonBioCredentialFallbackButtonStyle"

          android:layout_width="wrap_content"

          android:layout_height="wrap_content"

          android:layout_below="@id/description"

          android:visibility="gone" />

    </RelativeLayout>



  </ScrollView>