Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix fingerprint on lockscreen preivew" into udc-dev

Browse Source
This commit is contained in:
George Lin
2023-05-06 14:24:45 +00:00
committed by Android (Google) Code Review
parent 842ad4a540 d64d15f607
commit d6a5b13008
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
packages/SystemUI/res/layout/udfps_keyguard_preview.xml Normal file
View File

@@ -0,0 +1,42 @@
<?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.
-->
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/accessibility_fingerprint_label"
android:background="@drawable/fingerprint_bg">
<!-- LockScreen fingerprint icon from 0 stroke width to full width -->
<com.airbnb.lottie.LottieAnimationView
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHeight_percent="0.5"
app:layout_constraintWidth_percent="0.5"
app:lottie_autoPlay="false"
app:lottie_loop="false"
app:lottie_progress="1.0"
app:lottie_colorFilter="?android:attr/textColorPrimary"
app:lottie_rawRes="@raw/udfps_lockscreen_fp" />
</androidx.constraintlayout.widget.ConstraintLayout >

2
packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt
View File

@@ -273,7 +273,7 @@ constructor(
val finger =
LayoutInflater.from(context)
.inflate(
R.layout.udfps_keyguard_view_internal,
R.layout.udfps_keyguard_preview,
parentView,
false,
) as View