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

Commit e5a016e0 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

1/n: Prepare ConfirmDeviceCredentials to use BiometricPrompt 

CDC is going to use BiometricPrompt instead. This change
removes FingerprintManager from CDC. BiometricPrompt
will show before pin/pattern/pass is shown.

Bug: 111461540

Test: modified BiometricPromptDemo to use
      KeyguardManager#createConfirmDeviceCredentialIntent,
Test: Fingerprint is gone from CDC, rotation works
Test: atest SettingsRoboTests

Change-Id: I9ce2aad71961af8a0d5ee636600e2fbdb6154e47
parent dd3feeb1

res/drawable/ic_fingerprint_error.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2015 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

  -->

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

        android:width="32dp"

        android:height="32dp"

        android:viewportWidth="32.0"

        android:viewportHeight="32.0">

    <path

        android:fillColor="?android:attr/colorError"

        android:pathData="M15.99,2.5C8.53,2.5 2.5,8.54 2.5,16.0s6.03,13.5 13.49,13.5S29.5,23.46 29.5,16.0S23.45,2.5 15.99,2.5zM16.0,26.8c-5.97,0.0 -10.8,-4.83 -10.8,-10.8S10.03,5.2 16.0,5.2S26.8,10.03 26.8,16.0S21.97,26.8 16.0,26.8z"/>

    <path

        android:fillColor="?android:attr/colorError"

        android:pathData="M14.65,20.05l2.7,0.0l0.0,2.7l-2.7,0.0z"/>

    <path

        android:fillColor="?android:attr/colorError"

        android:pathData="M14.65,9.25l2.7,0.0l0.0,8.1l-2.7,0.0z"/>

</vector>

res/layout-land/confirm_lock_password.xml

+0 −8
Original line number Diff line number Diff line
@@ -87,14 +87,6 @@ 


            </LinearLayout>



            <ImageView

                android:id="@+id/fingerprintIcon"

                android:layout_gravity="end|bottom"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginBottom="28dp"

                android:layout_marginEnd="20dp"

                android:visibility="gone"/>

        </FrameLayout>



    </LinearLayout>

res/layout-land/confirm_lock_pattern.xml

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

                android:layout_height="match_parent"

                android:layout_weight="1"/>



            <ImageView

                android:id="@+id/fingerprintIcon"

                android:layout_gravity="center_vertical"

                android:layout_width="0dp"

                android:layout_weight="1"

                android:layout_height="wrap_content"

                android:visibility="gone"/>

        </LinearLayout>



    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

res/layout-land/confirm_lock_pattern_normal.xml

+0 −8
Original line number Diff line number Diff line
@@ -85,14 +85,6 @@ 
                    android:layout_marginEnd="?attr/suwMarginSides"

                    android:layout_marginBottom="24dp"

                    android:gravity="center_vertical"/>



                <ImageView

                    android:id="@+id/fingerprintIcon"

                    android:layout_gravity="center_horizontal"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:contentDescription="@string/confirm_fingerprint_icon_content_description"

                    android:visibility="gone"/>

            </LinearLayout>



        </ScrollView>

res/layout/confirm_lock_password_base.xml

+0 −14
Original line number Diff line number Diff line
@@ -89,19 +89,5 @@ 


        </LinearLayout>



        <View android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1"/>



        <ImageView

            android:id="@+id/fingerprintIcon"

            android:layout_gravity="center_horizontal"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentBottom="true"

            android:layout_marginBottom="24dp"

            android:contentDescription="@string/confirm_fingerprint_icon_content_description"

            android:visibility="gone"/>



    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

</FrameLayout>