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

Commit 0e11b18c authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge changes from topic "biometric-cc" 

* changes:
  3/n: Make CDCA transparent and add BiometricPrompt
  2/n: Add comments to launchConfirmationActivity parameters
  1/n: Prepare ConfirmDeviceCredentials to use BiometricPrompt
parents 887564b1 b3ee2315

AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ 
    <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />

    <uses-permission android:name="android.permission.USE_FINGERPRINT" />

    <uses-permission android:name="android.permission.MANAGE_FINGERPRINT" />

    <uses-permission android:name="android.permission.USE_BIOMETRIC" />

    <uses-permission android:name="android.permission.USE_BIOMETRIC_INTERNAL" />

    <uses-permission android:name="android.permission.USER_ACTIVITY" />

    <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />

    <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
@@ -1451,7 +1453,7 @@ 
        <!-- Lock screen settings -->

        <activity android:name=".password.ConfirmDeviceCredentialActivity"

            android:exported="true"

            android:theme="@android:style/Theme.NoDisplay">

            android:theme="@android:style/Theme.Translucent.NoTitleBar">

            <intent-filter android:priority="1">

                <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />

                <action android:name="android.app.action.CONFIRM_FRP_CREDENTIAL" />

res/drawable/ic_fingerprint_error.xml→res/anim/confirm_credential_biometric_transition_enter.xml

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

<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~ Copyright (C) 2018 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.
@@ -13,18 +14,11 @@ 
  ~ 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>
 


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

    android:shareInterpolator="false"

    android:zAdjustment="top">

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

        android:interpolator="@android:interpolator/linear_out_slow_in"

        android:duration="350"/>

</set>
 
 No newline at end of file

res/anim/confirm_credential_biometric_transition_exit.xml

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

<!--

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

  -->



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

    android:shareInterpolator="false"

    android:zAdjustment="top">

    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

        android:interpolator="@android:interpolator/linear_out_slow_in"

        android:duration="350" />

</set>
 
 No newline at end of file

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>