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

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

Merge "Remove warning compiling KeyguardLiftController"

parents 341f421e 80c612b5

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+5 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.Nullable; 
import android.content.Context;

import android.content.pm.PackageManager;



import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.assist.AssistModule;

import com.android.systemui.model.SysUiState;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -46,11 +47,13 @@ public abstract class SystemUIModule { 
    @Nullable

    static KeyguardLiftController provideKeyguardLiftController(Context context,

            StatusBarStateController statusBarStateController,

            AsyncSensorManager asyncSensorManager) {

            AsyncSensorManager asyncSensorManager,

            KeyguardUpdateMonitor keyguardUpdateMonitor) {

        if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) {

            return null;

        }

        return new KeyguardLiftController(statusBarStateController, asyncSensorManager);

        return new KeyguardLiftController(statusBarStateController, asyncSensorManager,

                keyguardUpdateMonitor);

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt

+2 −3
Original line number Diff line number Diff line
@@ -21,17 +21,16 @@ import android.hardware.TriggerEvent 
import android.hardware.TriggerEventListener

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.keyguard.KeyguardUpdateMonitorCallback

import com.android.systemui.Dependency

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.util.Assert

import com.android.systemui.util.sensors.AsyncSensorManager



class KeyguardLiftController constructor(

    private val statusBarStateController: StatusBarStateController,

    private val asyncSensorManager: AsyncSensorManager

    private val asyncSensorManager: AsyncSensorManager,

    private val keyguardUpdateMonitor: KeyguardUpdateMonitor

) : StatusBarStateController.StateListener, KeyguardUpdateMonitorCallback() {



    private val keyguardUpdateMonitor = Dependency.get(KeyguardUpdateMonitor::class.java)

    private val pickupSensor = asyncSensorManager.getDefaultSensor(Sensor.TYPE_PICK_UP_GESTURE)

    private var isListening = false

    private var bouncerVisible = false