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

Commit d2ed5efd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I3fb8291e,I099550a4,If04528c0,I31ee7bc9 

* changes:
  Implement a bare-bones UDFPS overlay
  Add interfaces for controlling the UDFPS overlay
  Add isUdfps to FingerprintService
  Add onFingerDown/onFingerUp to FingerprintService
parents 657b7d5d d602089b

core/java/android/hardware/fingerprint/IFingerprintService.aidl

+19 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.hardware.biometrics.IBiometricSensorReceiver; 
import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;

import android.hardware.fingerprint.IFingerprintClientActiveCallback;

import android.hardware.fingerprint.IFingerprintServiceReceiver;

import android.hardware.fingerprint.IUdfpsOverlayController;

import android.hardware.fingerprint.Fingerprint;

import android.view.Surface;

import java.util.List;
@@ -104,4 +105,22 @@ interface IFingerprintService { 


    // Give FingerprintService its ID. See AuthService.java

    void initializeConfiguration(int sensorId);



    // Notifies about a finger touching the sensor area.

    void onFingerDown(int x, int y, float minor, float major);



    // Notifies about a finger leaving the sensor area.

    void onFingerUp();



    // Returns whether the specified sensor is an under-display fingerprint sensor (UDFPS).

    boolean isUdfps(int sensorId);



    // Shows the UDFPS overlay.

    void showUdfpsOverlay();



    // Hides the UDFPS overlay.

    void hideUdfpsOverlay();



    // Sets the controller for managing the UDFPS overlay.

    void setUdfpsOverlayController(in IUdfpsOverlayController controller);

}

core/java/android/hardware/fingerprint/IUdfpsOverlayController.aidl

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

 * Copyright (C) 2020 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 android.hardware.fingerprint;



/**

 * Interface for interacting with the under-display fingerprint sensor (UDFPS) overlay.

 * @hide

 */

oneway interface IUdfpsOverlayController {

    // Shows the overlay.

    void showUdfpsOverlay();



    // Hides the overlay.

    void hideUdfpsOverlay();

}

packages/SystemUI/res/layout/udfps_view.xml

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

<com.google.android.systemui.udfps.UdfpsView

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

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

    android:id="@+id/udfps_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    systemui:sensorRadius="140px"

    systemui:sensorMarginBottom="630px"

    systemui:sensorTouchAreaCoefficient="0.5"/>

packages/SystemUI/res/values/attrs.xml

+7 −0
Original line number Diff line number Diff line
@@ -161,5 +161,12 @@ 
        <attr name="rippleMinSize" format="dimension" />

        <attr name="rippleMaxSize" format="dimension" />

    </declare-styleable>



    <declare-styleable name="UdfpsView">

        <attr name="sensorRadius" format="dimension"/>

        <attr name="sensorMarginBottom" format="dimension"/>

        <attr name="sensorPressureCoefficient" format="float"/>

        <attr name="sensorTouchAreaCoefficient" format="float"/>

    </declare-styleable>

</resources>

packages/SystemUI/res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -2840,4 +2840,11 @@ 
    <string name="controls_menu_add">Add controls</string>

    <!-- Controls menu, edit [CHAR_LIMIT=30] -->

    <string name="controls_menu_edit">Edit controls</string>



    <!-- Device-specific path to the node for enabling/disabling the high-brightness mode -->

    <string name="udfps_hbm_sysfs_path" translatable="false"></string>

    <!-- Device-specific payload for enabling the high-brightness mode -->

    <string name="udfps_hbm_enable_command" translatable="false"></string>

    <!-- Device-specific payload for disabling the high-brightness mode -->

    <string name="udfps_hbm_disable_command" translatable="false"></string>

</resources>