From 2741c07f997952a727481a527cbd0b78bb1f484f Mon Sep 17 00:00:00 2001 From: Alberto97 Date: Sun, 1 Oct 2017 17:11:27 +0200 Subject: [PATCH] sanders: Apply more LineageOS rebrand * CMActions: Move to Lineage SDK * CMActions -> LineageActions Since history is going to be killed anyway: * Move related stuff under "actions" or "doze" packages, make every class role clear * Rename misleading TouchscreenGesture* to Actions* Also add original-package for preferences migration Signed-off-by: jhenrique09 (cherry picked from commit 99c39df834c26edfc066e8ad2088a55e5a858166) --- {cmactions => LineageActions}/Android.mk | 5 +- .../AndroidManifest.xml | 17 +-- {cmactions => LineageActions}/proguard.flags | 2 +- .../res/drawable/ic_settings_gestures.xml | 0 .../res/values/array.xml | 0 .../res/values/strings.xml | 0 .../res/values/styles.xml | 2 +- .../res/xml/actions_panel.xml | 0 .../res/xml/doze_panel.xml | 2 +- .../device/ActionsPreferenceActivity.java | 6 +- .../device/ActionsPreferenceFragment.java | 12 +- .../device/BootCompletedReceiver.java | 10 +- .../device/DozePreferenceActivity.java | 4 +- .../device/LineageActionsService.java | 45 ++++--- .../device/LineageActionsSettings.java | 14 +- .../settings/device/SensorAction.java | 5 +- .../settings/device/SensorHelper.java | 5 +- .../settings/device/ServiceWrapper.java | 9 +- .../actions}/CameraActivationAction.java | 7 +- .../actions}/CameraActivationSensor.java | 20 +-- .../device/actions}/ChopChopSensor.java | 20 +-- .../settings/device/actions}/Constants.java | 7 +- .../settings/device/actions}/FlipToMute.java | 18 ++- .../device/actions}/LiftToSilence.java | 18 ++- .../device/actions}/ProximitySilencer.java | 16 ++- .../settings/device/actions}/TorchAction.java | 7 +- .../device/actions}/UpdatedStateNotifier.java | 5 +- .../device/doze}/DozePulseAction.java | 7 +- .../device/doze}/ProximitySensor.java | 19 ++- .../settings/device/doze}/ScreenReceiver.java | 5 +- .../device/doze}/ScreenStateNotifier.java | 5 +- .../settings/device/doze}/StowSensor.java | 19 ++- .../cyanogenmod/internal/util/FileUtils.java | 125 ------------------ device.mk | 4 +- 34 files changed, 198 insertions(+), 242 deletions(-) rename {cmactions => LineageActions}/Android.mk (90%) rename {cmactions => LineageActions}/AndroidManifest.xml (79%) rename {cmactions => LineageActions}/proguard.flags (80%) rename {cmactions => LineageActions}/res/drawable/ic_settings_gestures.xml (100%) rename {cmactions => LineageActions}/res/values/array.xml (100%) rename {cmactions => LineageActions}/res/values/strings.xml (100%) rename {cmactions => LineageActions}/res/values/styles.xml (92%) rename cmactions/res/xml/gesture_panel.xml => LineageActions/res/xml/actions_panel.xml (100%) rename {cmactions => LineageActions}/res/xml/doze_panel.xml (96%) rename cmactions/src/com/cyanogenmod/settings/device/TouchscreenGesturePreferenceActivity.java => LineageActions/src/org/lineageos/settings/device/ActionsPreferenceActivity.java (79%) rename cmactions/src/com/cyanogenmod/settings/device/TouchscreenGesturePreferenceFragment.java => LineageActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java (91%) rename {cmactions/src/com/cyanogenmod => LineageActions/src/org/lineageos}/settings/device/BootCompletedReceiver.java (86%) rename {cmactions/src/com/cyanogenmod => LineageActions/src/org/lineageos}/settings/device/DozePreferenceActivity.java (94%) rename cmactions/src/com/cyanogenmod/settings/device/CMActionsService.java => LineageActions/src/org/lineageos/settings/device/LineageActionsService.java (59%) rename cmactions/src/com/cyanogenmod/settings/device/CMActionsSettings.java => LineageActions/src/org/lineageos/settings/device/LineageActionsSettings.java (91%) rename {cmactions/src/com/cyanogenmod => LineageActions/src/org/lineageos}/settings/device/SensorAction.java (84%) rename {cmactions/src/com/cyanogenmod => LineageActions/src/org/lineageos}/settings/device/SensorHelper.java (96%) rename {cmactions/src/com/cyanogenmod => LineageActions/src/org/lineageos}/settings/device/ServiceWrapper.java (85%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/actions}/CameraActivationAction.java (96%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/actions}/CameraActivationSensor.java (69%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/actions}/ChopChopSensor.java (77%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/actions}/Constants.java (96%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/actions}/FlipToMute.java (86%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/actions}/LiftToSilence.java (86%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/actions}/ProximitySilencer.java (87%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/actions}/TorchAction.java (93%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/actions}/UpdatedStateNotifier.java (83%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/doze}/DozePulseAction.java (89%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/doze}/ProximitySensor.java (76%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/doze}/ScreenReceiver.java (92%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/doze}/ScreenStateNotifier.java (84%) rename {cmactions/src/com/cyanogenmod/settings/device => LineageActions/src/org/lineageos/settings/device/doze}/StowSensor.java (78%) delete mode 100644 cmactions/src/org/cyanogenmod/internal/util/FileUtils.java diff --git a/cmactions/Android.mk b/LineageActions/Android.mk similarity index 90% rename from cmactions/Android.mk rename to LineageActions/Android.mk index 747a317..aabf60a 100644 --- a/cmactions/Android.mk +++ b/LineageActions/Android.mk @@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_PACKAGE_NAME := CMActions +LOCAL_PACKAGE_NAME := LineageActions LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true @@ -13,7 +13,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-v14-preference \ android-support-v7-appcompat \ android-support-v7-preference \ - android-support-v7-recyclerview + android-support-v7-recyclerview \ + org.lineageos.platform.internal LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/cmactions/AndroidManifest.xml b/LineageActions/AndroidManifest.xml similarity index 79% rename from cmactions/AndroidManifest.xml rename to LineageActions/AndroidManifest.xml index 2171879..dc69823 100644 --- a/cmactions/AndroidManifest.xml +++ b/LineageActions/AndroidManifest.xml @@ -1,9 +1,11 @@ + + @@ -16,7 +18,7 @@ android:label="@string/device_settings_app_name" android:persistent="true"> - + @@ -32,18 +34,17 @@ + android:theme="@style/LineageActions"> - + + android:name=".ActionsPreferenceActivity" + android:label="@string/screen_gestures_panel_title" + android:theme="@style/LineageActions"> diff --git a/cmactions/proguard.flags b/LineageActions/proguard.flags similarity index 80% rename from cmactions/proguard.flags rename to LineageActions/proguard.flags index 32daf9b..ab22f4b 100644 --- a/cmactions/proguard.flags +++ b/LineageActions/proguard.flags @@ -1,4 +1,4 @@ --keep class org.cyanogenmod.CMActions.* { +-keep class org.lineageos.LineageActions.* { *; } diff --git a/cmactions/res/drawable/ic_settings_gestures.xml b/LineageActions/res/drawable/ic_settings_gestures.xml similarity index 100% rename from cmactions/res/drawable/ic_settings_gestures.xml rename to LineageActions/res/drawable/ic_settings_gestures.xml diff --git a/cmactions/res/values/array.xml b/LineageActions/res/values/array.xml similarity index 100% rename from cmactions/res/values/array.xml rename to LineageActions/res/values/array.xml diff --git a/cmactions/res/values/strings.xml b/LineageActions/res/values/strings.xml similarity index 100% rename from cmactions/res/values/strings.xml rename to LineageActions/res/values/strings.xml diff --git a/cmactions/res/values/styles.xml b/LineageActions/res/values/styles.xml similarity index 92% rename from cmactions/res/values/styles.xml rename to LineageActions/res/values/styles.xml index 98927a1..2c8a3d1 100644 --- a/cmactions/res/values/styles.xml +++ b/LineageActions/res/values/styles.xml @@ -16,7 +16,7 @@ limitations under the License. --> - diff --git a/cmactions/res/xml/gesture_panel.xml b/LineageActions/res/xml/actions_panel.xml similarity index 100% rename from cmactions/res/xml/gesture_panel.xml rename to LineageActions/res/xml/actions_panel.xml diff --git a/cmactions/res/xml/doze_panel.xml b/LineageActions/res/xml/doze_panel.xml similarity index 96% rename from cmactions/res/xml/doze_panel.xml rename to LineageActions/res/xml/doze_panel.xml index c260b94..bba3a9d 100644 --- a/cmactions/res/xml/doze_panel.xml +++ b/LineageActions/res/xml/doze_panel.xml @@ -21,7 +21,7 @@ android:key="ambient_display_key" android:title="@string/ambient_display_title"> - mUpdatedStateNotifiers = new LinkedList(); - public CMActionsService(Context context) { - super("CMActionService"); + public LineageActionsService(Context context) { + super("LineageActionService"); mContext = context; Log.d(TAG, "Starting"); - CMActionsSettings cmActionsSettings = new CMActionsSettings(context, this); + LineageActionsSettings lineageActionsSettings = new LineageActionsSettings(context, this); mSensorHelper = new SensorHelper(context); mScreenReceiver = new ScreenReceiver(context, this); @@ -56,19 +71,19 @@ public class CMActionsService extends IntentService implements ScreenStateNotifi mScreenStateNotifiers.add(mDozePulseAction); // Actionable sensors get screen on/off notifications - //mScreenStateNotifiers.add(new GlanceSensor(cmActionsSettings, mSensorHelper, mDozePulseAction)); - mScreenStateNotifiers.add(new ProximitySensor(cmActionsSettings, mSensorHelper, mDozePulseAction)); - mScreenStateNotifiers.add(new StowSensor(cmActionsSettings, mSensorHelper, mDozePulseAction)); + //mScreenStateNotifiers.add(new GlanceSensor(lineageActionsSettings, mSensorHelper, mDozePulseAction)); + mScreenStateNotifiers.add(new ProximitySensor(lineageActionsSettings, mSensorHelper, mDozePulseAction)); + mScreenStateNotifiers.add(new StowSensor(lineageActionsSettings, mSensorHelper, mDozePulseAction)); // Other actions that are always enabled - mUpdatedStateNotifiers.add(new CameraActivationSensor(cmActionsSettings, mSensorHelper)); - mUpdatedStateNotifiers.add(new ChopChopSensor(cmActionsSettings, mSensorHelper)); - mUpdatedStateNotifiers.add(new ProximitySilencer(cmActionsSettings, context, mSensorHelper)); - mUpdatedStateNotifiers.add(new FlipToMute(cmActionsSettings, context, mSensorHelper)); - mUpdatedStateNotifiers.add(new LiftToSilence(cmActionsSettings, context, mSensorHelper)); + 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)); mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); - mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "CMActionsWakeLock"); + mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "LineageActionsWakeLock"); updateState(); } diff --git a/cmactions/src/com/cyanogenmod/settings/device/CMActionsSettings.java b/LineageActions/src/org/lineageos/settings/device/LineageActionsSettings.java similarity index 91% rename from cmactions/src/com/cyanogenmod/settings/device/CMActionsSettings.java rename to LineageActions/src/org/lineageos/settings/device/LineageActionsSettings.java index a322fad..8cb1804 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/CMActionsSettings.java +++ b/LineageActions/src/org/lineageos/settings/device/LineageActionsSettings.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device; import android.content.ContentResolver; import android.content.Context; @@ -24,8 +25,13 @@ import android.provider.Settings; import android.util.Log; -public class CMActionsSettings { - private static final String TAG = "CMActions"; +import org.lineageos.settings.device.actions.Constants; +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"; private static final String GESTURE_CAMERA_ACTION_KEY = "gesture_camera_action"; private static final String GESTURE_CHOP_CHOP_KEY = "gesture_chop_chop"; @@ -46,7 +52,7 @@ public class CMActionsSettings { private boolean mFlipToMuteEnabled; private boolean mLiftToSilenceEnabled; - public CMActionsSettings(Context context, UpdatedStateNotifier updatedStateNotifier) { + public LineageActionsSettings(Context context, UpdatedStateNotifier updatedStateNotifier) { SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); loadPreferences(sharedPrefs); sharedPrefs.registerOnSharedPreferenceChangeListener(mPrefListener); diff --git a/cmactions/src/com/cyanogenmod/settings/device/SensorAction.java b/LineageActions/src/org/lineageos/settings/device/SensorAction.java similarity index 84% rename from cmactions/src/com/cyanogenmod/settings/device/SensorAction.java rename to LineageActions/src/org/lineageos/settings/device/SensorAction.java index ed590b2..4bc72c4 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/SensorAction.java +++ b/LineageActions/src/org/lineageos/settings/device/SensorAction.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,8 +15,8 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device; -interface SensorAction { +public interface SensorAction { public void action(); } diff --git a/cmactions/src/com/cyanogenmod/settings/device/SensorHelper.java b/LineageActions/src/org/lineageos/settings/device/SensorHelper.java similarity index 96% rename from cmactions/src/com/cyanogenmod/settings/device/SensorHelper.java rename to LineageActions/src/org/lineageos/settings/device/SensorHelper.java index 6cea2cf..2328bdf 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/SensorHelper.java +++ b/LineageActions/src/org/lineageos/settings/device/SensorHelper.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device; import java.util.List; import java.io.FileOutputStream; @@ -29,7 +30,7 @@ import android.hardware.TriggerEventListener; import android.util.Log; public class SensorHelper { - private static final String TAG = "CMActions"; + private static final String TAG = "LineageActions"; private static final int SENSOR_TYPE_MMI_CAMERA_ACTIVATION = 65540; private static final int SENSOR_TYPE_MMI_CHOP_CHOP = 65546; diff --git a/cmactions/src/com/cyanogenmod/settings/device/ServiceWrapper.java b/LineageActions/src/org/lineageos/settings/device/ServiceWrapper.java similarity index 85% rename from cmactions/src/com/cyanogenmod/settings/device/ServiceWrapper.java rename to LineageActions/src/org/lineageos/settings/device/ServiceWrapper.java index 0a4b21c..de3609a 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/ServiceWrapper.java +++ b/LineageActions/src/org/lineageos/settings/device/ServiceWrapper.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device; import android.content.Intent; import android.os.Binder; @@ -23,10 +24,10 @@ import android.os.IBinder; import android.util.Log; public class ServiceWrapper extends android.app.Service { - static final String TAG = "CMActions-ServiceWrapper"; + static final String TAG = "LineageActions-ServiceWrapper"; private final IBinder mBinder = new LocalBinder(); - private CMActionsService mCmActionsService; + private LineageActionsService mLineageActionsService; public interface ServiceCallback { void sendResults(int resultCode, Bundle b); @@ -44,7 +45,7 @@ public class ServiceWrapper extends android.app.Service { public void onCreate() { Log.i(TAG, "onCreate"); super.onCreate(); - mCmActionsService = new CMActionsService(this); + mLineageActionsService = new LineageActionsService(this); } @Override diff --git a/cmactions/src/com/cyanogenmod/settings/device/CameraActivationAction.java b/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java similarity index 96% rename from cmactions/src/com/cyanogenmod/settings/device/CameraActivationAction.java rename to LineageActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java index 45992e9..3d58992 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/CameraActivationAction.java +++ b/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.actions; import java.util.List; @@ -31,8 +32,10 @@ import android.os.Vibrator; import android.provider.MediaStore; import android.util.Log; +import org.lineageos.settings.device.SensorAction; + public class CameraActivationAction implements SensorAction { - private static final String TAG = "CMActions"; + private static final String TAG = "LineageActions"; private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500; diff --git a/cmactions/src/com/cyanogenmod/settings/device/CameraActivationSensor.java b/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java similarity index 69% rename from cmactions/src/com/cyanogenmod/settings/device/CameraActivationSensor.java rename to LineageActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java index 0128ec4..c83eb6c 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/CameraActivationSensor.java +++ b/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.actions; import java.util.List; @@ -24,20 +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.SensorHelper; + public class CameraActivationSensor implements SensorEventListener, UpdatedStateNotifier { - private static final String TAG = "CMActions-CameraSensor"; + private static final String TAG = "LineageActions-CameraSensor"; private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500; - private final CMActionsSettings mCMActionsSettings; + private final LineageActionsSettings mLineageActionsSettings; private final SensorHelper mSensorHelper; private final Sensor mSensor; private boolean mIsEnabled; - public CameraActivationSensor(CMActionsSettings cmActionsSettings, SensorHelper sensorHelper) { - mCMActionsSettings = cmActionsSettings; + public CameraActivationSensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper) { + mLineageActionsSettings = lineageActionsSettings; mSensorHelper = sensorHelper; mSensor = sensorHelper.getCameraActivationSensor(); mSensorHelper.registerListener(mSensor, this); @@ -45,10 +49,10 @@ public class CameraActivationSensor implements SensorEventListener, UpdatedState @Override public synchronized void updateState() { - if (mCMActionsSettings.isCameraGestureEnabled() && !mIsEnabled) { + if (mLineageActionsSettings.isCameraGestureEnabled() && !mIsEnabled) { Log.d(TAG, "Enabling"); mIsEnabled = true; - } else if (! mCMActionsSettings.isCameraGestureEnabled() && mIsEnabled) { + } else if (! mLineageActionsSettings.isCameraGestureEnabled() && mIsEnabled) { Log.d(TAG, "Disabling"); mIsEnabled = false; } @@ -57,7 +61,7 @@ public class CameraActivationSensor implements SensorEventListener, UpdatedState @Override public void onSensorChanged(SensorEvent event) { Log.d(TAG, "activate camera"); - if (mIsEnabled) mCMActionsSettings.cameraAction(); + if (mIsEnabled) mLineageActionsSettings.cameraAction(); } @Override diff --git a/cmactions/src/com/cyanogenmod/settings/device/ChopChopSensor.java b/LineageActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java similarity index 77% rename from cmactions/src/com/cyanogenmod/settings/device/ChopChopSensor.java rename to LineageActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java index ac9ace3..0ccd641 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/ChopChopSensor.java +++ b/LineageActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2016 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.actions; import java.util.List; @@ -24,12 +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.SensorHelper; + public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier { - private static final String TAG = "CMActions-ChopChopSensor"; + private static final String TAG = "LineageActions-ChopChopSensor"; private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500; - private final CMActionsSettings mCMActionsSettings; + private final LineageActionsSettings mLineageActionsSettings; private final SensorHelper mSensorHelper; private final Sensor mSensor; private final Sensor mProx; @@ -37,8 +41,8 @@ public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier private boolean mIsEnabled; private boolean mProxIsCovered; - public ChopChopSensor(CMActionsSettings cmActionsSettings, SensorHelper sensorHelper) { - mCMActionsSettings = cmActionsSettings; + public ChopChopSensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper) { + mLineageActionsSettings = lineageActionsSettings; mSensorHelper = sensorHelper; mSensor = sensorHelper.getChopChopSensor(); mProx = sensorHelper.getProximitySensor(); @@ -46,12 +50,12 @@ public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier @Override public synchronized void updateState() { - if (mCMActionsSettings.isChopChopGestureEnabled() && !mIsEnabled) { + if (mLineageActionsSettings.isChopChopGestureEnabled() && !mIsEnabled) { Log.d(TAG, "Enabling"); mSensorHelper.registerListener(mSensor, this); mSensorHelper.registerListener(mProx, mProxListener); mIsEnabled = true; - } else if (! mCMActionsSettings.isChopChopGestureEnabled() && mIsEnabled) { + } else if (! mLineageActionsSettings.isChopChopGestureEnabled() && mIsEnabled) { Log.d(TAG, "Disabling"); mSensorHelper.unregisterListener(this); mSensorHelper.unregisterListener(mProxListener); @@ -66,7 +70,7 @@ public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier Log.d(TAG, "proximity sensor covered, ignoring chop-chop"); return; } - mCMActionsSettings.chopChopAction(); + mLineageActionsSettings.chopChopAction(); } @Override diff --git a/cmactions/src/com/cyanogenmod/settings/device/Constants.java b/LineageActions/src/org/lineageos/settings/device/actions/Constants.java similarity index 96% rename from cmactions/src/com/cyanogenmod/settings/device/Constants.java rename to LineageActions/src/org/lineageos/settings/device/actions/Constants.java index aefab87..9f7d287 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/Constants.java +++ b/LineageActions/src/org/lineageos/settings/device/actions/Constants.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.actions; import java.util.HashMap; import java.util.Map; @@ -24,11 +25,11 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.util.Log; -import org.cyanogenmod.internal.util.FileUtils; +import org.lineageos.internal.util.FileUtils; public class Constants { - private static final String TAG = "CMActions"; + private static final String TAG = "LineageActions"; // Swap keys public static final String FP_HOME_KEY = "fp_home"; diff --git a/cmactions/src/com/cyanogenmod/settings/device/FlipToMute.java b/LineageActions/src/org/lineageos/settings/device/actions/FlipToMute.java similarity index 86% rename from cmactions/src/com/cyanogenmod/settings/device/FlipToMute.java rename to LineageActions/src/org/lineageos/settings/device/actions/FlipToMute.java index d5d5bf9..7db8154 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/FlipToMute.java +++ b/LineageActions/src/org/lineageos/settings/device/actions/FlipToMute.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2016 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.actions; import android.app.NotificationManager; import android.content.BroadcastReceiver; @@ -26,11 +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.SensorHelper; + public class FlipToMute implements UpdatedStateNotifier { - private static final String TAG = "CMActions-FlipToMute"; + private static final String TAG = "LineageActions-FlipToMute"; private final NotificationManager mNotificationManager; - private final CMActionsSettings mCMActionsSettings; + private final LineageActionsSettings mLineageActionsSettings; private final SensorHelper mSensorHelper; private final Sensor mFlatDown; private final Sensor mStow; @@ -42,9 +46,9 @@ public class FlipToMute implements UpdatedStateNotifier { private Context mContext; private Receiver mReceiver; - public FlipToMute(CMActionsSettings cmActionsSettings, Context context, + public FlipToMute(LineageActionsSettings lineageActionsSettings, Context context, SensorHelper sensorHelper) { - mCMActionsSettings = cmActionsSettings; + mLineageActionsSettings = lineageActionsSettings; mContext = context; mSensorHelper = sensorHelper; mFlatDown = sensorHelper.getFlatDownSensor(); @@ -57,14 +61,14 @@ public class FlipToMute implements UpdatedStateNotifier { @Override public void updateState() { - if (mCMActionsSettings.isFlipToMuteEnabled() && !mIsEnabled) { + if (mLineageActionsSettings.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 (!mCMActionsSettings.isFlipToMuteEnabled() && mIsEnabled) { + } else if (!mLineageActionsSettings.isFlipToMuteEnabled() && mIsEnabled) { Log.d(TAG, "Disabling"); mSensorHelper.unregisterListener(mFlatDownListener); mSensorHelper.unregisterListener(mStowListener); diff --git a/cmactions/src/com/cyanogenmod/settings/device/LiftToSilence.java b/LineageActions/src/org/lineageos/settings/device/actions/LiftToSilence.java similarity index 86% rename from cmactions/src/com/cyanogenmod/settings/device/LiftToSilence.java rename to LineageActions/src/org/lineageos/settings/device/actions/LiftToSilence.java index a5286c3..4fe671f 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/LiftToSilence.java +++ b/LineageActions/src/org/lineageos/settings/device/actions/LiftToSilence.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2016 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.actions; import android.content.Context; import android.hardware.Sensor; @@ -25,10 +26,13 @@ import android.telecom.TelecomManager; import android.telephony.TelephonyManager; import android.util.Log; -public class LiftToSilence extends PhoneStateListener implements SensorEventListener, UpdatedStateNotifier { - private static final String TAG = "CMActions-LiftToSilence"; +import org.lineageos.settings.device.LineageActionsSettings; +import org.lineageos.settings.device.SensorHelper; - private final CMActionsSettings mCMActionsSettings; +public class LiftToSilence extends PhoneStateListener implements SensorEventListener, UpdatedStateNotifier { + private static final String TAG = "LineageActions-LiftToSilence"; + + private final LineageActionsSettings mLineageActionsSettings; private final SensorHelper mSensorHelper; private final Sensor mFlatUpSensor; private final Sensor mStowSensor; @@ -40,9 +44,9 @@ public class LiftToSilence extends PhoneStateListener implements SensorEventList private boolean mIsStowed; private boolean mLastFlatUp; - public LiftToSilence(CMActionsSettings cmActionsSettings, Context context, + public LiftToSilence(LineageActionsSettings lineageActionsSettings, Context context, SensorHelper sensorHelper) { - mCMActionsSettings = cmActionsSettings; + mLineageActionsSettings = lineageActionsSettings; mSensorHelper = sensorHelper; mFlatUpSensor = sensorHelper.getFlatUpSensor(); mStowSensor = sensorHelper.getStowSensor(); @@ -52,7 +56,7 @@ public class LiftToSilence extends PhoneStateListener implements SensorEventList @Override public void updateState() { - if (mCMActionsSettings.isLiftToSilenceEnabled()) { + if (mLineageActionsSettings.isLiftToSilenceEnabled()) { mTelephonyManager.listen(this, LISTEN_CALL_STATE); } else { mTelephonyManager.listen(this, 0); diff --git a/cmactions/src/com/cyanogenmod/settings/device/ProximitySilencer.java b/LineageActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java similarity index 87% rename from cmactions/src/com/cyanogenmod/settings/device/ProximitySilencer.java rename to LineageActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java index 3975776..1b6ff2d 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/ProximitySilencer.java +++ b/LineageActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.actions; import android.content.Context; import android.hardware.Sensor; @@ -25,28 +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.SensorHelper; + import static android.telephony.TelephonyManager.*; public class ProximitySilencer extends PhoneStateListener implements SensorEventListener, UpdatedStateNotifier { - private static final String TAG = "CMActions-ProximitySilencer"; + private static final String TAG = "LineageActions-ProximitySilencer"; private static final int SILENCE_DELAY_MS = 500; private final TelecomManager mTelecomManager; private final TelephonyManager mTelephonyManager; - private final CMActionsSettings mCMActionsSettings; + private final LineageActionsSettings mLineageActionsSettings; private final SensorHelper mSensorHelper; private final Sensor mSensor; private boolean mIsRinging; private long mRingStartedMs; private boolean mCoveredRinging; - public ProximitySilencer(CMActionsSettings cmActionsSettings, Context context, + public ProximitySilencer(LineageActionsSettings lineageActionsSettings, Context context, SensorHelper sensorHelper) { mTelecomManager = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE); mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); - mCMActionsSettings = cmActionsSettings; + mLineageActionsSettings = lineageActionsSettings; mSensorHelper = sensorHelper; mSensor = sensorHelper.getProximitySensor(); mCoveredRinging = false; @@ -55,7 +59,7 @@ public class ProximitySilencer extends PhoneStateListener implements SensorEvent @Override public void updateState() { - if (mCMActionsSettings.isIrSilencerEnabled()) { + if (mLineageActionsSettings.isIrSilencerEnabled()) { mTelephonyManager.listen(this, LISTEN_CALL_STATE); } else { mTelephonyManager.listen(this, 0); diff --git a/cmactions/src/com/cyanogenmod/settings/device/TorchAction.java b/LineageActions/src/org/lineageos/settings/device/actions/TorchAction.java similarity index 93% rename from cmactions/src/com/cyanogenmod/settings/device/TorchAction.java rename to LineageActions/src/org/lineageos/settings/device/actions/TorchAction.java index f66ae59..22ff1f5 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/TorchAction.java +++ b/LineageActions/src/org/lineageos/settings/device/actions/TorchAction.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.actions; import android.content.Context; import android.hardware.camera2.CameraManager; @@ -23,8 +24,10 @@ import android.hardware.camera2.CameraAccessException; import android.os.Vibrator; import android.util.Log; +import org.lineageos.settings.device.SensorAction; + public class TorchAction implements SensorAction { - private static final String TAG = "CMActions"; + private static final String TAG = "LineageActions"; private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500; diff --git a/cmactions/src/com/cyanogenmod/settings/device/UpdatedStateNotifier.java b/LineageActions/src/org/lineageos/settings/device/actions/UpdatedStateNotifier.java similarity index 83% rename from cmactions/src/com/cyanogenmod/settings/device/UpdatedStateNotifier.java rename to LineageActions/src/org/lineageos/settings/device/actions/UpdatedStateNotifier.java index 268b4bd..224a57b 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/UpdatedStateNotifier.java +++ b/LineageActions/src/org/lineageos/settings/device/actions/UpdatedStateNotifier.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,8 +15,8 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.actions; -interface UpdatedStateNotifier { +public interface UpdatedStateNotifier { public void updateState(); } diff --git a/cmactions/src/com/cyanogenmod/settings/device/DozePulseAction.java b/LineageActions/src/org/lineageos/settings/device/doze/DozePulseAction.java similarity index 89% rename from cmactions/src/com/cyanogenmod/settings/device/DozePulseAction.java rename to LineageActions/src/org/lineageos/settings/device/doze/DozePulseAction.java index 75ef9c3..4445b28 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/DozePulseAction.java +++ b/LineageActions/src/org/lineageos/settings/device/doze/DozePulseAction.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,14 +15,16 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.doze; import android.content.Context; import android.content.Intent; import android.util.Log; +import org.lineageos.settings.device.SensorAction; + public class DozePulseAction implements SensorAction, ScreenStateNotifier { - private static final String TAG = "CMActions"; + private static final String TAG = "LineageActions"; private static final int DELAY_BETWEEN_DOZES_IN_MS = 1500; diff --git a/cmactions/src/com/cyanogenmod/settings/device/ProximitySensor.java b/LineageActions/src/org/lineageos/settings/device/doze/ProximitySensor.java similarity index 76% rename from cmactions/src/com/cyanogenmod/settings/device/ProximitySensor.java rename to LineageActions/src/org/lineageos/settings/device/doze/ProximitySensor.java index 7c4af6c..dca3c41 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/ProximitySensor.java +++ b/LineageActions/src/org/lineageos/settings/device/doze/ProximitySensor.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,17 +15,21 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.doze; import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.util.Log; -public class ProximitySensor implements ScreenStateNotifier, SensorEventListener { - private static final String TAG = "CMActions-ProximitySensor"; +import org.lineageos.settings.device.LineageActionsSettings; +import org.lineageos.settings.device.SensorAction; +import org.lineageos.settings.device.SensorHelper; - private final CMActionsSettings mCMActionsSettings; +public class ProximitySensor implements ScreenStateNotifier, SensorEventListener { + private static final String TAG = "LineageActions-ProximitySensor"; + + private final LineageActionsSettings mLineageActionsSettings; private final SensorHelper mSensorHelper; private final SensorAction mSensorAction; private final Sensor mSensor; @@ -33,9 +38,9 @@ public class ProximitySensor implements ScreenStateNotifier, SensorEventListener private boolean mSawNear = false; - public ProximitySensor(CMActionsSettings cmActionsSettings, SensorHelper sensorHelper, + public ProximitySensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper, SensorAction action) { - mCMActionsSettings = cmActionsSettings; + mLineageActionsSettings = lineageActionsSettings; mSensorHelper = sensorHelper; mSensorAction = action; @@ -53,7 +58,7 @@ public class ProximitySensor implements ScreenStateNotifier, SensorEventListener @Override public void screenTurnedOff() { - if (mCMActionsSettings.isIrWakeupEnabled() && !mEnabled) { + if (mLineageActionsSettings.isIrWakeupEnabled() && !mEnabled) { Log.d(TAG, "Enabling"); mSensorHelper.registerListener(mSensor, this); mEnabled = true; diff --git a/cmactions/src/com/cyanogenmod/settings/device/ScreenReceiver.java b/LineageActions/src/org/lineageos/settings/device/doze/ScreenReceiver.java similarity index 92% rename from cmactions/src/com/cyanogenmod/settings/device/ScreenReceiver.java rename to LineageActions/src/org/lineageos/settings/device/doze/ScreenReceiver.java index fd39852..924c2b1 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/ScreenReceiver.java +++ b/LineageActions/src/org/lineageos/settings/device/doze/ScreenReceiver.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.doze; import java.util.List; @@ -23,6 +24,8 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import org.lineageos.settings.device.actions.Constants; + public class ScreenReceiver extends BroadcastReceiver { private final ScreenStateNotifier mNotifier; diff --git a/cmactions/src/com/cyanogenmod/settings/device/ScreenStateNotifier.java b/LineageActions/src/org/lineageos/settings/device/doze/ScreenStateNotifier.java similarity index 84% rename from cmactions/src/com/cyanogenmod/settings/device/ScreenStateNotifier.java rename to LineageActions/src/org/lineageos/settings/device/doze/ScreenStateNotifier.java index 1ffd844..7b9ab59 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/ScreenStateNotifier.java +++ b/LineageActions/src/org/lineageos/settings/device/doze/ScreenStateNotifier.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,9 +15,9 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.doze; -interface ScreenStateNotifier { +public interface ScreenStateNotifier { public void screenTurnedOn(); public void screenTurnedOff(); } diff --git a/cmactions/src/com/cyanogenmod/settings/device/StowSensor.java b/LineageActions/src/org/lineageos/settings/device/doze/StowSensor.java similarity index 78% rename from cmactions/src/com/cyanogenmod/settings/device/StowSensor.java rename to LineageActions/src/org/lineageos/settings/device/doze/StowSensor.java index 84f0f08..74c22fe 100644 --- a/cmactions/src/com/cyanogenmod/settings/device/StowSensor.java +++ b/LineageActions/src/org/lineageos/settings/device/doze/StowSensor.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 The CyanogenMod Project + * 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. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.cyanogenmod.settings.device; +package org.lineageos.settings.device.doze; import android.hardware.Sensor; import android.hardware.SensorEvent; @@ -23,11 +24,15 @@ import android.util.Log; import java.lang.System; +import org.lineageos.settings.device.LineageActionsSettings; +import org.lineageos.settings.device.SensorAction; +import org.lineageos.settings.device.SensorHelper; + public class StowSensor implements ScreenStateNotifier, SensorEventListener { - private static final String TAG = "CMActions-StowSensor"; + private static final String TAG = "LineageActions-StowSensor"; private static final int IN_POCKET_MIN_TIME = 5000; - private final CMActionsSettings mCMActionsSettings; + private final LineageActionsSettings mLineageActionsSettings; private final SensorHelper mSensorHelper; private final SensorAction mSensorAction; private final Sensor mSensor; @@ -36,9 +41,9 @@ public class StowSensor implements ScreenStateNotifier, SensorEventListener { private boolean mLastStowed; private long isStowedTime; - public StowSensor(CMActionsSettings cmActionsSettings, SensorHelper sensorHelper, + public StowSensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper, SensorAction action) { - mCMActionsSettings = cmActionsSettings; + mLineageActionsSettings = lineageActionsSettings; mSensorHelper = sensorHelper; mSensorAction = action; @@ -56,8 +61,8 @@ public class StowSensor implements ScreenStateNotifier, SensorEventListener { @Override public void screenTurnedOff() { - if (!mCMActionsSettings.isIrWakeupEnabled() && - mCMActionsSettings.isPickUpEnabled() && !mEnabled) { + if (!mLineageActionsSettings.isIrWakeupEnabled() && + mLineageActionsSettings.isPickUpEnabled() && !mEnabled) { Log.d(TAG, "Enabling"); mSensorHelper.registerListener(mSensor, this); mEnabled = true; diff --git a/cmactions/src/org/cyanogenmod/internal/util/FileUtils.java b/cmactions/src/org/cyanogenmod/internal/util/FileUtils.java deleted file mode 100644 index 517c1de..0000000 --- a/cmactions/src/org/cyanogenmod/internal/util/FileUtils.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2016 The CyanogenMod 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 org.cyanogenmod.internal.util; - -import android.util.Log; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; - -public final class FileUtils { - private static final String TAG = "FileUtils"; - - private FileUtils() { - // This class is not supposed to be instantiated - } - - /** - * Reads the first line of text from the given file. - * Reference {@link BufferedReader#readLine()} for clarification on what a line is - * - * @return the read line contents, or null on failure - */ - public static String readOneLine(String fileName) { - String line = null; - BufferedReader reader = null; - - try { - reader = new BufferedReader(new FileReader(fileName), 512); - line = reader.readLine(); - } catch (FileNotFoundException e) { - Log.w(TAG, "No such file " + fileName + " for reading", e); - } catch (IOException e) { - Log.e(TAG, "Could not read from file " + fileName, e); - } finally { - try { - if (reader != null) { - reader.close(); - } - } catch (IOException e) { - // Ignored, not much we can do anyway - } - } - - return line; - } - - /** - * Writes the given value into the given file - * - * @return true on success, false on failure - */ - public static boolean writeLine(String fileName, String value) { - BufferedWriter writer = null; - - try { - writer = new BufferedWriter(new FileWriter(fileName)); - writer.write(value); - } catch (FileNotFoundException e) { - Log.w(TAG, "No such file " + fileName + " for writing", e); - return false; - } catch (IOException e) { - Log.e(TAG, "Could not write to file " + fileName, e); - return false; - } finally { - try { - if (writer != null) { - writer.close(); - } - } catch (IOException e) { - // Ignored, not much we can do anyway - } - } - - return true; - } - - /** - * Checks whether the given file exists - * - * @return true if exists, false if not - */ - public static boolean fileExists(String fileName) { - final File file = new File(fileName); - return file.exists(); - } - - /** - * Checks whether the given file is readable - * - * @return true if readable, false if not - */ - public static boolean isFileReadable(String fileName) { - final File file = new File(fileName); - return file.exists() && file.canRead(); - } - - /** - * Checks whether the given file is writable - * - * @return true if writable, false if not - */ - public static boolean isFileWritable(String fileName) { - final File file = new File(fileName); - return file.exists() && file.canWrite(); - } -} \ No newline at end of file diff --git a/device.mk b/device.mk index f609081..4f60d1c 100644 --- a/device.mk +++ b/device.mk @@ -126,9 +126,9 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/gps/etc/sap.conf:system/etc/sap.conf \ $(LOCAL_PATH)/gps/etc/xtwifi.conf:system/etc/xtwifi.conf -# CMActions +# LineageActions PRODUCT_PACKAGES += \ - CMActions + LineageActions # Display PRODUCT_PACKAGES += \