CMActions: remove glance sensor
This commit is contained in:
@@ -56,7 +56,7 @@ public class CMActionsService extends IntentService implements ScreenStateNotifi
|
|||||||
mScreenStateNotifiers.add(mDozePulseAction);
|
mScreenStateNotifiers.add(mDozePulseAction);
|
||||||
|
|
||||||
// Actionable sensors get screen on/off notifications
|
// Actionable sensors get screen on/off notifications
|
||||||
mScreenStateNotifiers.add(new GlanceSensor(cmActionsSettings, mSensorHelper, mDozePulseAction));
|
//mScreenStateNotifiers.add(new GlanceSensor(cmActionsSettings, mSensorHelper, mDozePulseAction));
|
||||||
mScreenStateNotifiers.add(new ProximitySensor(cmActionsSettings, mSensorHelper, mDozePulseAction));
|
mScreenStateNotifiers.add(new ProximitySensor(cmActionsSettings, mSensorHelper, mDozePulseAction));
|
||||||
mScreenStateNotifiers.add(new StowSensor(cmActionsSettings, mSensorHelper, mDozePulseAction));
|
mScreenStateNotifiers.add(new StowSensor(cmActionsSettings, mSensorHelper, mDozePulseAction));
|
||||||
|
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2017 The LineageOS 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 com.cyanogenmod.settings.device;
|
|
||||||
|
|
||||||
import android.hardware.Sensor;
|
|
||||||
import android.hardware.TriggerEvent;
|
|
||||||
import android.hardware.TriggerEventListener;
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
public class GlanceSensor implements ScreenStateNotifier {
|
|
||||||
private static final String TAG = "CMActions-GlanceSensor";
|
|
||||||
|
|
||||||
private final CMActionsSettings mCMActionsSettings;
|
|
||||||
private final SensorHelper mSensorHelper;
|
|
||||||
private final SensorAction mSensorAction;
|
|
||||||
private final Sensor mSensor;
|
|
||||||
|
|
||||||
private boolean mEnabled;
|
|
||||||
|
|
||||||
public GlanceSensor(CMActionsSettings cmActionsSettings, SensorHelper sensorHelper,
|
|
||||||
SensorAction action) {
|
|
||||||
mCMActionsSettings = cmActionsSettings;
|
|
||||||
mSensorHelper = sensorHelper;
|
|
||||||
mSensorAction = action;
|
|
||||||
|
|
||||||
mSensor = sensorHelper.getGlanceSensor();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void screenTurnedOn() {
|
|
||||||
if (mEnabled) {
|
|
||||||
Log.d(TAG, "Disabling");
|
|
||||||
mSensorHelper.cancelTriggerSensor(mSensor, mGlanceListener);
|
|
||||||
mEnabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void screenTurnedOff() {
|
|
||||||
if (mCMActionsSettings.isPickUpEnabled() && !mEnabled) {
|
|
||||||
Log.d(TAG, "Enabling");
|
|
||||||
mSensorHelper.requestTriggerSensor(mSensor, mGlanceListener);
|
|
||||||
mEnabled = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private TriggerEventListener mGlanceListener = new TriggerEventListener() {
|
|
||||||
@Override
|
|
||||||
public void onTrigger(TriggerEvent event) {
|
|
||||||
Log.d(TAG, "triggered");
|
|
||||||
mSensorAction.action();
|
|
||||||
mSensorHelper.requestTriggerSensor(mSensor, mGlanceListener);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -80,10 +80,6 @@ public class SensorHelper {
|
|||||||
return mSensorManager.getDefaultSensor(SENSOR_TYPE_MMI_FLAT_DOWN, true);
|
return mSensorManager.getDefaultSensor(SENSOR_TYPE_MMI_FLAT_DOWN, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Sensor getGlanceSensor() {
|
|
||||||
return mSensorManager.getDefaultSensor(Sensor.TYPE_GLANCE_GESTURE, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Sensor getProximitySensor() {
|
public Sensor getProximitySensor() {
|
||||||
return mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY, true);
|
return mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY, true);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user