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

Commit 63a1282b authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Make DozeSensors, DozeTriggers use ProximitySensor 

This CL takes the features used in DozeSensors and applies
them to the publicly available util.sensors.ProximitySensor class.

It introduces a RateLimiter class for temprorarily suspending the
ProximitySensor as requested.

It introduces a ProximityCheck class for a quick, one time test
of the proximity sensor.

There is some reshuffling of Sensor related code to its own package
as well.

Bug: 141122220
Test: atest SystemUITests
Change-Id: If126be9a56c6966c1678ee70fa6f4623e51361a7
parent a6efc88a

packages/SystemUI/plugin/src/com/android/systemui/plugins/SensorManagerPlugin.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.systemui.plugins.annotations.ProvidesInterface; 


/**

 * Allows for additional sensors to be retrieved from

 * {@link com.android.systemui.util.AsyncSensorManager}.

 * {@link com.android.systemui.util.sensors.AsyncSensorManager}.

 */

@ProvidesInterface(action = SensorManagerPlugin.ACTION, version = SensorManagerPlugin.VERSION)

public interface SensorManagerPlugin extends Plugin {

packages/SystemUI/src/com/android/systemui/Dependency.java

+4 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
package com.android.systemui;



import android.annotation.Nullable;

import android.app.AlarmManager;

import android.app.INotificationManager;

import android.content.res.Configuration;

import android.hardware.SensorPrivacyManager;
@@ -110,10 +111,10 @@ import com.android.systemui.statusbar.policy.UserSwitcherController; 
import com.android.systemui.statusbar.policy.ZenModeController;

import com.android.systemui.tuner.TunablePadding.TunablePaddingService;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.util.AsyncSensorManager;

import com.android.systemui.util.leak.GarbageMonitor;

import com.android.systemui.util.leak.LeakDetector;

import com.android.systemui.util.leak.LeakReporter;

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



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -314,6 +315,7 @@ public class Dependency { 
    @Inject Lazy<INotificationManager> mINotificationManager;

    @Inject Lazy<FalsingManager> mFalsingManager;

    @Inject Lazy<SysUiState> mSysUiStateFlagsContainer;

    @Inject Lazy<AlarmManager> mAlarmManager;



    @Inject

    public Dependency() {
@@ -508,6 +510,7 @@ public class Dependency { 
        mProviders.put(INotificationManager.class, mINotificationManager::get);

        mProviders.put(FalsingManager.class, mFalsingManager::get);

        mProviders.put(SysUiState.class, mSysUiStateFlagsContainer::get);

        mProviders.put(AlarmManager.class, mAlarmManager::get);



        // TODO(b/118592525): to support multi-display , we start to add something which is

        //                    per-display, while others may be global. I think it's time to add

packages/SystemUI/src/com/android/systemui/DependencyProvider.java

+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.systemui.Dependency.MAIN_LOOPER_NAME; 
import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME;



import android.annotation.Nullable;

import android.app.AlarmManager;

import android.app.INotificationManager;

import android.content.Context;

import android.hardware.SensorPrivacyManager;
@@ -230,4 +231,11 @@ public class DependencyProvider { 
            @Named(MAIN_HANDLER_NAME) Handler mainHandler) {

        return new DeviceProvisionedControllerImpl(context, mainHandler);

    }



    /** */

    @Singleton

    @Provides

    public AlarmManager provideAlarmManager(Context context) {

        return context.getSystemService(AlarmManager.class);

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import com.android.systemui.assist.AssistModule; 
import com.android.systemui.model.SysUiState;

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

import com.android.systemui.statusbar.phone.KeyguardLiftController;

import com.android.systemui.util.AsyncSensorManager;

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



import javax.inject.Singleton;

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

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

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.util.AsyncSensorManager;

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



import java.io.PrintWriter;