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

Commit ef6e8cda authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Refactor AuthBiometricFingerprintViewBinder for scuba test" into... 

Merge "Refactor AuthBiometricFingerprintViewBinder for scuba test" into udc-dev am: da32d859 am: 01e494d2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23356978



Change-Id: I751190f4d4d543c65d1784bca9121bc3c05dd995
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ff7f916 01e494d2

packages/SystemUI/res/layout/auth_biometric_contents.xml

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

        android:layout_gravity="center">



        <com.airbnb.lottie.LottieAnimationView

            android:id="@+id/biometric_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:contentDescription="@null"

            android:scaleType="fitXY" />

        <include layout="@layout/auth_biometric_icon"/>



        <com.airbnb.lottie.LottieAnimationView

            android:id="@+id/biometric_icon_overlay"

packages/SystemUI/res/layout/auth_biometric_icon.xml

0 → 100644
+26 −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.

  -->





<com.airbnb.lottie.LottieAnimationView

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

    android:id="@+id/biometric_icon"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="center"

    android:contentDescription="@null"

    android:scaleType="fitXY"/>
 
 No newline at end of file

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

+4 −0
Original line number Diff line number Diff line
@@ -961,6 +961,10 @@ public abstract class AuthBiometricView extends LinearLayout implements AuthBiom 
        return Utils.isDeviceCredentialAllowed(mPromptInfo);

    }



    public LottieAnimationView getIconView() {

        return mIconView;

    }



    @AuthDialog.DialogSize int getSize() {

        return mSize;

    }

packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractor.kt

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ constructor( 
                            sendFoldStateUpdate(isFolded)

                        }

                    }



                sendFoldStateUpdate(false)

                screenSizeFoldProvider.registerCallback(callback, mainExecutor)

                awaitClose { screenSizeFoldProvider.unregisterCallback(callback) }

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/AuthBiometricFingerprintIconViewBinder.kt

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

 * 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.

 *

 */



package com.android.systemui.biometrics.ui.binder



import android.view.DisplayInfo

import androidx.lifecycle.Lifecycle

import androidx.lifecycle.repeatOnLifecycle

import com.airbnb.lottie.LottieAnimationView

import com.android.systemui.biometrics.AuthBiometricFingerprintView

import com.android.systemui.biometrics.ui.viewmodel.AuthBiometricFingerprintViewModel

import com.android.systemui.lifecycle.repeatWhenAttached

import kotlinx.coroutines.launch



/** Sub-binder for [AuthBiometricFingerprintView.mIconView]. */

object AuthBiometricFingerprintIconViewBinder {



    /**

     * Binds a [AuthBiometricFingerprintView.mIconView] to a [AuthBiometricFingerprintViewModel].

     */

    @JvmStatic

    fun bind(view: LottieAnimationView, viewModel: AuthBiometricFingerprintViewModel) {

        view.repeatWhenAttached {

            repeatOnLifecycle(Lifecycle.State.STARTED) {

                val displayInfo = DisplayInfo()

                view.context.display?.getDisplayInfo(displayInfo)

                viewModel.setRotation(displayInfo.rotation)

                viewModel.onConfigurationChanged(view.context.resources.configuration)

                launch { viewModel.iconAsset.collect { iconAsset -> view.setAnimation(iconAsset) } }

            }

        }

    }

}