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

Commit 023558f7 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Update udfps animations to use view controllers" into sc-dev

parents 18f5dc3c 0de40221

packages/SystemUI/res/layout/udfps_animation_view_bp.xml→packages/SystemUI/res/layout/udfps_bp_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.android.systemui.biometrics.UdfpsAnimationViewBp

<com.android.systemui.biometrics.UdfpsBpView

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

    android:id="@+id/udfps_animation_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

</com.android.systemui.biometrics.UdfpsAnimationViewBp>
 
</com.android.systemui.biometrics.UdfpsBpView>

packages/SystemUI/res/layout/udfps_animation_view_enroll.xml→packages/SystemUI/res/layout/udfps_enroll_view.xml

+8 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.android.systemui.biometrics.UdfpsAnimationViewEnroll

<com.android.systemui.biometrics.UdfpsEnrollView

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

    android:id="@+id/udfps_animation_view"

    android:layout_width="match_parent"
@@ -31,4 +31,9 @@ 
        android:layout_gravity="center"

        android:visibility="gone"/>



</com.android.systemui.biometrics.UdfpsAnimationViewEnroll>
 
    <!-- Fingerprint -->

    <ImageView

        android:id="@+id/udfps_enroll_animation_fp_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

</com.android.systemui.biometrics.UdfpsEnrollView>

packages/SystemUI/res/layout/udfps_animation_view_fpm_other.xml→packages/SystemUI/res/layout/udfps_fpm_other_view.xml

+8 −2
Original line number Diff line number Diff line
@@ -14,9 +14,15 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.android.systemui.biometrics.UdfpsAnimationViewFpmOther

<com.android.systemui.biometrics.UdfpsFpmOtherView

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

    android:id="@+id/udfps_animation_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

</com.android.systemui.biometrics.UdfpsAnimationViewFpmOther>
 


    <!-- Fingerprint -->

    <ImageView

        android:id="@+id/udfps_fpm_other_fp_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

</com.android.systemui.biometrics.UdfpsFpmOtherView>

packages/SystemUI/res/layout/udfps_animation_view_keyguard.xml→packages/SystemUI/res/layout/udfps_keyguard_view.xml

+10 −2
Original line number Diff line number Diff line
@@ -14,9 +14,17 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.android.systemui.biometrics.UdfpsAnimationViewKeyguard

<com.android.systemui.biometrics.UdfpsKeyguardView

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

    android:id="@+id/udfps_animation_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

</com.android.systemui.biometrics.UdfpsAnimationViewKeyguard>
 


    <!-- TODO: add background protection -->



    <!-- Fingerprint -->

    <ImageView

        android:id="@+id/udfps_keyguard_animation_fp_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

</com.android.systemui.biometrics.UdfpsKeyguardView>

packages/SystemUI/res/layout/udfps_view.xml

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ 
    android:layout_height="match_parent"

    systemui:sensorTouchAreaCoefficient="0.5">



    <ViewStub

        android:id="@+id/animation_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <com.android.systemui.biometrics.UdfpsSurfaceView

        android:id="@+id/hbm_view"

        android:layout_width="match_parent"