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

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

Merge "Implement PromptContentViewWithMoreOptionsButton for credential view" into main

parents 91250c16 fa4bde6d

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

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,15 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content" />



    <LinearLayout

        android:id="@+id/customized_view_container"

        android:orientation="vertical"

        android:gravity="center_vertical"

        android:layout_below="@id/subtitle"

        android:layout_alignParentLeft="true"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" />



  </RelativeLayout>



  <FrameLayout

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

+9 −0
Original line number Diff line number Diff line
@@ -60,6 +60,15 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>



        <LinearLayout

            android:id="@+id/customized_view_container"

            android:orientation="vertical"

            android:gravity="center_vertical"

            android:layout_below="@id/subtitle"

            android:layout_alignParentLeft="true"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



        <TextView

            android:id="@+id/error"

            style="?errorTextAppearanceLand"

packages/SystemUI/res/layout/auth_credential_password_pin_content_view.xml

+7 −0
Original line number Diff line number Diff line
@@ -55,6 +55,13 @@ 
          android:layout_height="wrap_content"

          android:layout_below="@id/subtitle" />



      <LinearLayout

          android:id="@+id/customized_view_container"

          android:orientation="vertical"

          android:gravity="center_vertical"

          android:layout_below="@id/subtitle"

          android:layout_width="match_parent"

          android:layout_height="wrap_content" />

    </RelativeLayout>



  </ScrollView>

packages/SystemUI/res/layout/auth_credential_pattern_view.xml

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>



        <LinearLayout

            android:id="@+id/customized_view_container"

            android:orientation="vertical"

            android:gravity="center_vertical"

            android:layout_below="@id/subtitle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

    </RelativeLayout>



    <RelativeLayout

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

+2 −1
Original line number Diff line number Diff line
@@ -518,7 +518,8 @@ public class AuthContainerView extends LinearLayout 
                mConfig.mOpPackageName);

        final CredentialViewModel vm = mCredentialViewModelProvider.get();

        vm.setAnimateContents(animateContents);

        ((CredentialView) mCredentialView).init(vm, this, mPanelController, animatePanel);

        ((CredentialView) mCredentialView).init(vm, this, mPanelController, animatePanel,

                mBiometricCallback);



        mLayout.addView(mCredentialView);

    }