motorola: rename LineageActions to MotoActions

Change-Id: I07e4b35309b3a645fab5acfcd1d18f8c30109b92
This commit is contained in:
Jan Altensen 2020-12-23 15:33:49 +01:00
parent ccde739ef1
commit d2314727ed
No known key found for this signature in database
GPG Key ID: 3E45BB95F7AD33DA
32 changed files with 93 additions and 93 deletions

View File

@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := LineageActions
LOCAL_PACKAGE_NAME := MotoActions
LOCAL_CERTIFICATE := platform
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_USE_AAPT2 := true

View File

@ -34,7 +34,7 @@
<activity
android:name=".DozePreferenceActivity"
android:label="@string/ambient_display_gestures_title"
android:theme="@style/LineageActions">
android:theme="@style/MotoActions">
<intent-filter>
<action android:name="com.android.settings.action.IA_SETTINGS" />
</intent-filter>
@ -49,7 +49,7 @@
<activity
android:name=".ActionsPreferenceActivity"
android:label="@string/moto_gestures_panel_title"
android:theme="@style/LineageActions">
android:theme="@style/MotoActions">
<intent-filter>
<action android:name="com.android.settings.action.IA_SETTINGS" />
</intent-filter>

View File

@ -1,4 +1,4 @@
-keep class org.lineageos.LineageActions.* {
-keep class org.lineageos.MotoActions.* {
*;
}

View File

@ -16,7 +16,7 @@
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<style name="LineageActions" parent="@android:style/Theme.DeviceDefault.Settings">
<style name="MotoActions" parent="@android:style/Theme.DeviceDefault.Settings">
<item name="preferenceCategoryStyle">@style/SettingsTheme.PreferenceCategoryStyle</item>
<item name="preferenceTheme">@style/SettingsTheme.Preference</item>
<item name="switchPreferenceStyle">@style/SettingsTheme.SwitchPreferenceStyle</item>

View File

@ -28,7 +28,7 @@ import android.util.Log;
import org.lineageos.settings.device.ServiceWrapper.LocalBinder;
public class BootCompletedReceiver extends BroadcastReceiver {
static final String TAG = "LineageActions";
static final String TAG = "MotoActions";
private ServiceWrapper mServiceWrapper;
@Override

View File

@ -38,8 +38,8 @@ public class DozePreferenceActivity extends PreferenceActivity {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
addPreferencesFromResource(R.xml.doze_panel);
boolean dozeEnabled = LineageActionsSettings.isDozeEnabled(getActivity());
boolean aodEnabled = LineageActionsSettings.isAODEnabled(getActivity());
boolean dozeEnabled = MotoActionsSettings.isDozeEnabled(getActivity());
boolean aodEnabled = MotoActionsSettings.isAODEnabled(getActivity());
PreferenceCategory ambientDisplayCat = (PreferenceCategory)
findPreference(CATEGORY_AMBIENT_DISPLAY);
if (ambientDisplayCat != null) {

View File

@ -42,9 +42,9 @@ import org.lineageos.settings.device.doze.ScreenReceiver;
import org.lineageos.settings.device.doze.ScreenStateNotifier;
import org.lineageos.settings.device.doze.StowSensor;
public class LineageActionsService extends IntentService implements ScreenStateNotifier,
public class MotoActionsService extends IntentService implements ScreenStateNotifier,
UpdatedStateNotifier {
private static final String TAG = "LineageActions";
private static final String TAG = "MotoActions";
private final Context mContext;
@ -58,13 +58,13 @@ public class LineageActionsService extends IntentService implements ScreenStateN
private final List<UpdatedStateNotifier> mUpdatedStateNotifiers =
new LinkedList<UpdatedStateNotifier>();
public LineageActionsService(Context context) {
super("LineageActionService");
public MotoActionsService(Context context) {
super("MotoActionservice");
mContext = context;
Log.d(TAG, "Starting");
LineageActionsSettings lineageActionsSettings = new LineageActionsSettings(context, this);
MotoActionsSettings MotoActionsSettings = new MotoActionsSettings(context, this);
mSensorHelper = new SensorHelper(context);
mScreenReceiver = new ScreenReceiver(context, this);
@ -72,20 +72,20 @@ public class LineageActionsService extends IntentService implements ScreenStateN
mScreenStateNotifiers.add(mDozePulseAction);
// Actionable sensors get screen on/off notifications
mScreenStateNotifiers.add(new GlanceSensor(lineageActionsSettings, mSensorHelper, mDozePulseAction));
mScreenStateNotifiers.add(new ProximitySensor(lineageActionsSettings, mSensorHelper, mDozePulseAction));
mScreenStateNotifiers.add(new StowSensor(lineageActionsSettings, mSensorHelper, mDozePulseAction));
mScreenStateNotifiers.add(new FlatUpSensor(lineageActionsSettings, mSensorHelper, mDozePulseAction));
mScreenStateNotifiers.add(new GlanceSensor(MotoActionsSettings, mSensorHelper, mDozePulseAction));
mScreenStateNotifiers.add(new ProximitySensor(MotoActionsSettings, mSensorHelper, mDozePulseAction));
mScreenStateNotifiers.add(new StowSensor(MotoActionsSettings, mSensorHelper, mDozePulseAction));
mScreenStateNotifiers.add(new FlatUpSensor(MotoActionsSettings, mSensorHelper, mDozePulseAction));
// Other actions that are always enabled
mUpdatedStateNotifiers.add(new CameraActivationSensor(lineageActionsSettings, mSensorHelper));
mUpdatedStateNotifiers.add(new ChopChopSensor(lineageActionsSettings, mSensorHelper));
mUpdatedStateNotifiers.add(new ProximitySilencer(lineageActionsSettings, context, mSensorHelper));
mUpdatedStateNotifiers.add(new FlipToMute(lineageActionsSettings, context, mSensorHelper));
mUpdatedStateNotifiers.add(new LiftToSilence(lineageActionsSettings, context, mSensorHelper));
mUpdatedStateNotifiers.add(new CameraActivationSensor(MotoActionsSettings, mSensorHelper));
mUpdatedStateNotifiers.add(new ChopChopSensor(MotoActionsSettings, mSensorHelper));
mUpdatedStateNotifiers.add(new ProximitySilencer(MotoActionsSettings, context, mSensorHelper));
mUpdatedStateNotifiers.add(new FlipToMute(MotoActionsSettings, context, mSensorHelper));
mUpdatedStateNotifiers.add(new LiftToSilence(MotoActionsSettings, context, mSensorHelper));
mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "LineageActionsWakeLock");
mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MotoActionsWakeLock");
updateState();
}

View File

@ -27,8 +27,8 @@ import org.lineageos.settings.device.actions.UpdatedStateNotifier;
import org.lineageos.settings.device.actions.CameraActivationAction;
import org.lineageos.settings.device.actions.TorchAction;
public class LineageActionsSettings {
private static final String TAG = "LineageActions";
public class MotoActionsSettings {
private static final String TAG = "MotoActions";
private static final String GESTURE_CAMERA_ACTION_KEY = "gesture_camera_action";
private static final String GESTURE_CHOP_CHOP_KEY = "gesture_chop_chop";
@ -49,7 +49,7 @@ public class LineageActionsSettings {
private boolean mFlipToMuteEnabled;
private boolean mLiftToSilenceEnabled;
public LineageActionsSettings(Context context, UpdatedStateNotifier updatedStateNotifier) {
public MotoActionsSettings(Context context, UpdatedStateNotifier updatedStateNotifier) {
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
loadPreferences(sharedPrefs);
sharedPrefs.registerOnSharedPreferenceChangeListener(mPrefListener);

View File

@ -30,7 +30,7 @@ import android.hardware.TriggerEventListener;
import android.util.Log;
public class SensorHelper {
private static final String TAG = "LineageActions";
private static final String TAG = "MotoActions";
private static final int SENSOR_TYPE_MMI_CAMERA_ACTIVATION = 65540;
private static final int SENSOR_TYPE_MMI_CHOP_CHOP = 65546;

View File

@ -24,10 +24,10 @@ import android.os.IBinder;
import android.util.Log;
public class ServiceWrapper extends android.app.Service {
static final String TAG = "LineageActions-ServiceWrapper";
static final String TAG = "MotoActions-ServiceWrapper";
private final IBinder mBinder = new LocalBinder();
private LineageActionsService mLineageActionsService;
private MotoActionsService mMotoActionsService;
public interface ServiceCallback {
void sendResults(int resultCode, Bundle b);
@ -45,7 +45,7 @@ public class ServiceWrapper extends android.app.Service {
public void onCreate() {
Log.i(TAG, "onCreate");
super.onCreate();
mLineageActionsService = new LineageActionsService(this);
mMotoActionsService = new MotoActionsService(this);
}
@Override

View File

@ -35,7 +35,7 @@ import android.util.Log;
import org.lineageos.settings.device.SensorAction;
public class CameraActivationAction implements SensorAction {
private static final String TAG = "LineageActions";
private static final String TAG = "MotoActions";
private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500;

View File

@ -25,23 +25,23 @@ import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
import android.util.Log;
import org.lineageos.settings.device.LineageActionsSettings;
import org.lineageos.settings.device.MotoActionsSettings;
import org.lineageos.settings.device.SensorHelper;
public class CameraActivationSensor implements SensorEventListener, UpdatedStateNotifier {
private static final String TAG = "LineageActions-CameraSensor";
private static final String TAG = "MotoActions-CameraSensor";
private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500;
private final LineageActionsSettings mLineageActionsSettings;
private final MotoActionsSettings mMotoActionsSettings;
private final SensorHelper mSensorHelper;
private final Sensor mSensor;
private boolean mIsEnabled;
public CameraActivationSensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper) {
mLineageActionsSettings = lineageActionsSettings;
public CameraActivationSensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper) {
mMotoActionsSettings = MotoActionsSettings;
mSensorHelper = sensorHelper;
mSensor = sensorHelper.getCameraActivationSensor();
mSensorHelper.registerListener(mSensor, this);
@ -49,10 +49,10 @@ public class CameraActivationSensor implements SensorEventListener, UpdatedState
@Override
public synchronized void updateState() {
if (mLineageActionsSettings.isCameraGestureEnabled() && !mIsEnabled) {
if (mMotoActionsSettings.isCameraGestureEnabled() && !mIsEnabled) {
Log.d(TAG, "Enabling");
mIsEnabled = true;
} else if (! mLineageActionsSettings.isCameraGestureEnabled() && mIsEnabled) {
} else if (! mMotoActionsSettings.isCameraGestureEnabled() && mIsEnabled) {
Log.d(TAG, "Disabling");
mIsEnabled = false;
}
@ -61,7 +61,7 @@ public class CameraActivationSensor implements SensorEventListener, UpdatedState
@Override
public void onSensorChanged(SensorEvent event) {
Log.d(TAG, "activate camera");
if (mIsEnabled) mLineageActionsSettings.cameraAction();
if (mIsEnabled) mMotoActionsSettings.cameraAction();
}
@Override

View File

@ -25,15 +25,15 @@ import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
import android.util.Log;
import org.lineageos.settings.device.LineageActionsSettings;
import org.lineageos.settings.device.MotoActionsSettings;
import org.lineageos.settings.device.SensorHelper;
public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier {
private static final String TAG = "LineageActions-ChopChopSensor";
private static final String TAG = "MotoActions-ChopChopSensor";
private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500;
private final LineageActionsSettings mLineageActionsSettings;
private final MotoActionsSettings mMotoActionsSettings;
private final SensorHelper mSensorHelper;
private final Sensor mSensor;
private final Sensor mProx;
@ -41,8 +41,8 @@ public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier
private boolean mIsEnabled;
private boolean mProxIsCovered;
public ChopChopSensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper) {
mLineageActionsSettings = lineageActionsSettings;
public ChopChopSensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper) {
mMotoActionsSettings = MotoActionsSettings;
mSensorHelper = sensorHelper;
mSensor = sensorHelper.getChopChopSensor();
mProx = sensorHelper.getProximitySensor();
@ -50,12 +50,12 @@ public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier
@Override
public synchronized void updateState() {
if (mLineageActionsSettings.isChopChopGestureEnabled() && !mIsEnabled) {
if (mMotoActionsSettings.isChopChopGestureEnabled() && !mIsEnabled) {
Log.d(TAG, "Enabling");
mSensorHelper.registerListener(mSensor, this);
mSensorHelper.registerListener(mProx, mProxListener);
mIsEnabled = true;
} else if (! mLineageActionsSettings.isChopChopGestureEnabled() && mIsEnabled) {
} else if (! mMotoActionsSettings.isChopChopGestureEnabled() && mIsEnabled) {
Log.d(TAG, "Disabling");
mSensorHelper.unregisterListener(this);
mSensorHelper.unregisterListener(mProxListener);
@ -70,7 +70,7 @@ public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier
Log.d(TAG, "proximity sensor covered, ignoring chop-chop");
return;
}
mLineageActionsSettings.chopChopAction();
mMotoActionsSettings.chopChopAction();
}
@Override

View File

@ -27,14 +27,14 @@ import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.util.Log;
import org.lineageos.settings.device.LineageActionsSettings;
import org.lineageos.settings.device.MotoActionsSettings;
import org.lineageos.settings.device.SensorHelper;
public class FlipToMute implements UpdatedStateNotifier {
private static final String TAG = "LineageActions-FlipToMute";
private static final String TAG = "MotoActions-FlipToMute";
private final NotificationManager mNotificationManager;
private final LineageActionsSettings mLineageActionsSettings;
private final MotoActionsSettings mMotoActionsSettings;
private final SensorHelper mSensorHelper;
private final Sensor mFlatDown;
private final Sensor mStow;
@ -46,9 +46,9 @@ public class FlipToMute implements UpdatedStateNotifier {
private Context mContext;
private Receiver mReceiver;
public FlipToMute(LineageActionsSettings lineageActionsSettings, Context context,
public FlipToMute(MotoActionsSettings MotoActionsSettings, Context context,
SensorHelper sensorHelper) {
mLineageActionsSettings = lineageActionsSettings;
mMotoActionsSettings = MotoActionsSettings;
mContext = context;
mSensorHelper = sensorHelper;
mFlatDown = sensorHelper.getFlatDownSensor();
@ -61,14 +61,14 @@ public class FlipToMute implements UpdatedStateNotifier {
@Override
public void updateState() {
if (mLineageActionsSettings.isFlipToMuteEnabled() && !mIsEnabled) {
if (mMotoActionsSettings.isFlipToMuteEnabled() && !mIsEnabled) {
Log.d(TAG, "Enabling");
mSensorHelper.registerListener(mFlatDown, mFlatDownListener);
mSensorHelper.registerListener(mStow, mStowListener);
mContext.registerReceiver(mReceiver,
new IntentFilter(NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED));
mIsEnabled = true;
} else if (!mLineageActionsSettings.isFlipToMuteEnabled() && mIsEnabled) {
} else if (!mMotoActionsSettings.isFlipToMuteEnabled() && mIsEnabled) {
Log.d(TAG, "Disabling");
mSensorHelper.unregisterListener(mFlatDownListener);
mSensorHelper.unregisterListener(mStowListener);

View File

@ -26,13 +26,13 @@ import android.telecom.TelecomManager;
import android.telephony.TelephonyManager;
import android.util.Log;
import org.lineageos.settings.device.LineageActionsSettings;
import org.lineageos.settings.device.MotoActionsSettings;
import org.lineageos.settings.device.SensorHelper;
public class LiftToSilence extends PhoneStateListener implements SensorEventListener, UpdatedStateNotifier {
private static final String TAG = "LineageActions-LiftToSilence";
private static final String TAG = "MotoActions-LiftToSilence";
private final LineageActionsSettings mLineageActionsSettings;
private final MotoActionsSettings mMotoActionsSettings;
private final SensorHelper mSensorHelper;
private final Sensor mFlatUpSensor;
private final Sensor mStowSensor;
@ -44,9 +44,9 @@ public class LiftToSilence extends PhoneStateListener implements SensorEventList
private boolean mIsStowed;
private boolean mLastFlatUp;
public LiftToSilence(LineageActionsSettings lineageActionsSettings, Context context,
public LiftToSilence(MotoActionsSettings MotoActionsSettings, Context context,
SensorHelper sensorHelper) {
mLineageActionsSettings = lineageActionsSettings;
mMotoActionsSettings = MotoActionsSettings;
mSensorHelper = sensorHelper;
mFlatUpSensor = sensorHelper.getFlatUpSensor();
mStowSensor = sensorHelper.getStowSensor();
@ -56,7 +56,7 @@ public class LiftToSilence extends PhoneStateListener implements SensorEventList
@Override
public void updateState() {
if (mLineageActionsSettings.isLiftToSilenceEnabled()) {
if (mMotoActionsSettings.isLiftToSilenceEnabled()) {
mTelephonyManager.listen(this, LISTEN_CALL_STATE);
} else {
mTelephonyManager.listen(this, 0);

View File

@ -26,31 +26,31 @@ import android.telecom.TelecomManager;
import android.telephony.TelephonyManager;
import android.util.Log;
import org.lineageos.settings.device.LineageActionsSettings;
import org.lineageos.settings.device.MotoActionsSettings;
import org.lineageos.settings.device.SensorHelper;
import static android.telephony.TelephonyManager.*;
public class ProximitySilencer extends PhoneStateListener implements SensorEventListener, UpdatedStateNotifier {
private static final String TAG = "LineageActions-ProximitySilencer";
private static final String TAG = "MotoActions-ProximitySilencer";
private static final int SILENCE_DELAY_MS = 500;
private final TelecomManager mTelecomManager;
private final TelephonyManager mTelephonyManager;
private final LineageActionsSettings mLineageActionsSettings;
private final MotoActionsSettings mMotoActionsSettings;
private final SensorHelper mSensorHelper;
private final Sensor mSensor;
private boolean mIsRinging;
private long mRingStartedMs;
private boolean mCoveredRinging;
public ProximitySilencer(LineageActionsSettings lineageActionsSettings, Context context,
public ProximitySilencer(MotoActionsSettings MotoActionsSettings, Context context,
SensorHelper sensorHelper) {
mTelecomManager = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
mLineageActionsSettings = lineageActionsSettings;
mMotoActionsSettings = MotoActionsSettings;
mSensorHelper = sensorHelper;
mSensor = sensorHelper.getProximitySensor();
mCoveredRinging = false;
@ -59,7 +59,7 @@ public class ProximitySilencer extends PhoneStateListener implements SensorEvent
@Override
public void updateState() {
if (mLineageActionsSettings.isIrSilencerEnabled()) {
if (mMotoActionsSettings.isIrSilencerEnabled()) {
mTelephonyManager.listen(this, LISTEN_CALL_STATE);
} else {
mTelephonyManager.listen(this, 0);

View File

@ -27,7 +27,7 @@ import android.util.Log;
import org.lineageos.settings.device.SensorAction;
public class TorchAction implements SensorAction {
private static final String TAG = "LineageActions";
private static final String TAG = "MotoActions";
private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500;

View File

@ -24,7 +24,7 @@ import android.util.Log;
import org.lineageos.settings.device.SensorAction;
public class DozePulseAction implements SensorAction, ScreenStateNotifier {
private static final String TAG = "LineageActions";
private static final String TAG = "MotoActions";
private static final int DELAY_BETWEEN_DOZES_IN_MS = 1500;

View File

@ -22,14 +22,14 @@ import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.util.Log;
import org.lineageos.settings.device.LineageActionsSettings;
import org.lineageos.settings.device.MotoActionsSettings;
import org.lineageos.settings.device.SensorAction;
import org.lineageos.settings.device.SensorHelper;
public class FlatUpSensor implements ScreenStateNotifier {
private static final String TAG = "LineageActions-FlatUpSensor";
private static final String TAG = "MotoActions-FlatUpSensor";
private final LineageActionsSettings mLineageActionsSettings;
private final MotoActionsSettings mMotoActionsSettings;
private final SensorHelper mSensorHelper;
private final SensorAction mSensorAction;
private final Sensor mFlatUpSensor;
@ -39,9 +39,9 @@ public class FlatUpSensor implements ScreenStateNotifier {
private boolean mIsStowed;
private boolean mLastFlatUp;
public FlatUpSensor(LineageActionsSettings LineageActionsSettings, SensorHelper sensorHelper,
public FlatUpSensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper,
SensorAction action) {
mLineageActionsSettings = LineageActionsSettings;
mMotoActionsSettings = MotoActionsSettings;
mSensorHelper = sensorHelper;
mSensorAction = action;
@ -61,7 +61,7 @@ public class FlatUpSensor implements ScreenStateNotifier {
@Override
public void screenTurnedOff() {
if (mLineageActionsSettings.isPickUpEnabled() && !mEnabled) {
if (mMotoActionsSettings.isPickUpEnabled() && !mEnabled) {
Log.d(TAG, "Enabling");
mSensorHelper.registerListener(mFlatUpSensor, mFlatUpListener);
mSensorHelper.registerListener(mStowSensor, mStowListener);

View File

@ -21,14 +21,14 @@ import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.util.Log;
import org.lineageos.settings.device.LineageActionsSettings;
import org.lineageos.settings.device.MotoActionsSettings;
import org.lineageos.settings.device.SensorAction;
import org.lineageos.settings.device.SensorHelper;
public class GlanceSensor implements ScreenStateNotifier {
private static final String TAG = "LineageActions-GlanceSensor";
private static final String TAG = "MotoActions-GlanceSensor";
private final LineageActionsSettings mLineageActionsSettings;
private final MotoActionsSettings mMotoActionsSettings;
private final SensorHelper mSensorHelper;
private final SensorAction mSensorAction;
@ -37,9 +37,9 @@ public class GlanceSensor implements ScreenStateNotifier {
private boolean mEnabled;
public GlanceSensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper,
public GlanceSensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper,
SensorAction action) {
mLineageActionsSettings = lineageActionsSettings;
mMotoActionsSettings = MotoActionsSettings;
mSensorHelper = sensorHelper;
mSensorAction = action;
@ -59,7 +59,7 @@ public class GlanceSensor implements ScreenStateNotifier {
@Override
public void screenTurnedOff() {
if (mLineageActionsSettings.isPickUpEnabled() && !mEnabled) {
if (mMotoActionsSettings.isPickUpEnabled() && !mEnabled) {
Log.d(TAG, "Enabling");
mSensorHelper.registerListener(mSensor, mGlanceListener);
mSensorHelper.registerListener(mSensor, mApproachGlanceListener);

View File

@ -22,14 +22,14 @@ import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.util.Log;
import org.lineageos.settings.device.LineageActionsSettings;
import org.lineageos.settings.device.MotoActionsSettings;
import org.lineageos.settings.device.SensorAction;
import org.lineageos.settings.device.SensorHelper;
public class ProximitySensor implements ScreenStateNotifier, SensorEventListener {
private static final String TAG = "LineageActions-ProximitySensor";
private static final String TAG = "MotoActions-ProximitySensor";
private final LineageActionsSettings mLineageActionsSettings;
private final MotoActionsSettings mMotoActionsSettings;
private final SensorHelper mSensorHelper;
private final SensorAction mSensorAction;
private final Sensor mSensor;
@ -38,9 +38,9 @@ public class ProximitySensor implements ScreenStateNotifier, SensorEventListener
private boolean mSawNear = false;
public ProximitySensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper,
public ProximitySensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper,
SensorAction action) {
mLineageActionsSettings = lineageActionsSettings;
mMotoActionsSettings = MotoActionsSettings;
mSensorHelper = sensorHelper;
mSensorAction = action;
@ -58,7 +58,7 @@ public class ProximitySensor implements ScreenStateNotifier, SensorEventListener
@Override
public void screenTurnedOff() {
if (mLineageActionsSettings.isIrWakeupEnabled() && !mEnabled) {
if (mMotoActionsSettings.isIrWakeupEnabled() && !mEnabled) {
Log.d(TAG, "Enabling");
mSensorHelper.registerListener(mSensor, this);
mEnabled = true;

View File

@ -24,15 +24,15 @@ import android.util.Log;
import java.lang.System;
import org.lineageos.settings.device.LineageActionsSettings;
import org.lineageos.settings.device.MotoActionsSettings;
import org.lineageos.settings.device.SensorAction;
import org.lineageos.settings.device.SensorHelper;
public class StowSensor implements ScreenStateNotifier, SensorEventListener {
private static final String TAG = "LineageActions-StowSensor";
private static final String TAG = "MotoActions-StowSensor";
private static final int IN_POCKET_MIN_TIME = 5000;
private final LineageActionsSettings mLineageActionsSettings;
private final MotoActionsSettings mMotoActionsSettings;
private final SensorHelper mSensorHelper;
private final SensorAction mSensorAction;
private final Sensor mSensor;
@ -41,9 +41,9 @@ public class StowSensor implements ScreenStateNotifier, SensorEventListener {
private boolean mLastStowed;
private long isStowedTime;
public StowSensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper,
public StowSensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper,
SensorAction action) {
mLineageActionsSettings = lineageActionsSettings;
mMotoActionsSettings = MotoActionsSettings;
mSensorHelper = sensorHelper;
mSensorAction = action;
@ -61,8 +61,8 @@ public class StowSensor implements ScreenStateNotifier, SensorEventListener {
@Override
public void screenTurnedOff() {
if (!mLineageActionsSettings.isIrWakeupEnabled() &&
mLineageActionsSettings.isPickUpEnabled() && !mEnabled) {
if (!mMotoActionsSettings.isIrWakeupEnabled() &&
mMotoActionsSettings.isPickUpEnabled() && !mEnabled) {
Log.d(TAG, "Enabling");
mSensorHelper.registerListener(mSensor, this);
mEnabled = true;