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

Commit 4e5d302a authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Add label to fingerprint overlay." into sc-dev am: 6523da35 

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

Change-Id: I3c5a0166a8324d04c56e440a1cf3dc62f301f998
parents 7a6adc25 6523da35

packages/SystemUI/res/layout/udfps_enroll_view.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -24,5 +24,6 @@ 
    <ImageView

    <ImageView

        android:id="@+id/udfps_enroll_animation_fp_view"

        android:id="@+id/udfps_enroll_animation_fp_view"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

        android:layout_height="match_parent"

        android:contentDescription="@string/accessibility_fingerprint_label"/>

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

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -658,8 +658,7 @@ public class UdfpsController implements DozeReceiver { 
                    // during a11y.

                    // during a11y.

                    if (reason == IUdfpsOverlayController.REASON_ENROLL_FIND_SENSOR

                    if (reason == IUdfpsOverlayController.REASON_ENROLL_FIND_SENSOR

                            || reason == IUdfpsOverlayController.REASON_ENROLL_ENROLLING) {

                            || reason == IUdfpsOverlayController.REASON_ENROLL_ENROLLING) {

                        mView.setImportantForAccessibility(

                        mView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);

                                View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);

                    }

                    }





                    mWindowManager.addView(mView, computeLayoutParams(animation));

                    mWindowManager.addView(mView, computeLayoutParams(animation));