diff --git a/LineageActions/Android.mk b/MotoActions/Android.mk similarity index 96% rename from LineageActions/Android.mk rename to MotoActions/Android.mk index 9c08082..24ef023 100644 --- a/LineageActions/Android.mk +++ b/MotoActions/Android.mk @@ -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_PRIVILEGED_MODULE := true diff --git a/LineageActions/AndroidManifest.xml b/MotoActions/AndroidManifest.xml similarity index 85% rename from LineageActions/AndroidManifest.xml rename to MotoActions/AndroidManifest.xml index b8b4799..811e328 100644 --- a/LineageActions/AndroidManifest.xml +++ b/MotoActions/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -25,8 +25,8 @@ android:persistent="true"> - + @@ -52,9 +52,9 @@ + android:theme="@style/MotoActions"> - + @@ -63,7 +63,7 @@ android:name=".ActionsPreferenceActivity" android:label="@string/moto_actions_title" android:summary="@string/device_gestures_summary" - android:theme="@style/LineageActions"> + android:theme="@style/MotoActions"> @@ -81,13 +81,13 @@ + android:theme="@style/MotoActions"> + android:theme="@style/MotoActions"> diff --git a/LineageActions/res/drawable/ic_gesture.png b/MotoActions/res/drawable/ic_gesture.png similarity index 100% rename from LineageActions/res/drawable/ic_gesture.png rename to MotoActions/res/drawable/ic_gesture.png diff --git a/LineageActions/res/drawable/ic_settings_doze.xml b/MotoActions/res/drawable/ic_settings_doze.xml similarity index 100% rename from LineageActions/res/drawable/ic_settings_doze.xml rename to MotoActions/res/drawable/ic_settings_doze.xml diff --git a/LineageActions/res/drawable/ic_settings_fingerprint.xml b/MotoActions/res/drawable/ic_settings_fingerprint.xml similarity index 100% rename from LineageActions/res/drawable/ic_settings_fingerprint.xml rename to MotoActions/res/drawable/ic_settings_fingerprint.xml diff --git a/LineageActions/res/drawable/ic_settings_gestures.xml b/MotoActions/res/drawable/ic_settings_gestures.xml similarity index 100% rename from LineageActions/res/drawable/ic_settings_gestures.xml rename to MotoActions/res/drawable/ic_settings_gestures.xml diff --git a/LineageActions/res/drawable/ic_settings_screen_off_gestures.xml b/MotoActions/res/drawable/ic_settings_screen_off_gestures.xml similarity index 100% rename from LineageActions/res/drawable/ic_settings_screen_off_gestures.xml rename to MotoActions/res/drawable/ic_settings_screen_off_gestures.xml diff --git a/LineageActions/res/drawable/switchbar_background.xml b/MotoActions/res/drawable/switchbar_background.xml similarity index 100% rename from LineageActions/res/drawable/switchbar_background.xml rename to MotoActions/res/drawable/switchbar_background.xml diff --git a/LineageActions/res/layout/doze.xml b/MotoActions/res/layout/doze.xml similarity index 100% rename from LineageActions/res/layout/doze.xml rename to MotoActions/res/layout/doze.xml diff --git a/LineageActions/res/layout/fp_gesture.xml b/MotoActions/res/layout/fp_gesture.xml similarity index 100% rename from LineageActions/res/layout/fp_gesture.xml rename to MotoActions/res/layout/fp_gesture.xml diff --git a/LineageActions/res/layout/switch_bar.xml b/MotoActions/res/layout/switch_bar.xml similarity index 96% rename from LineageActions/res/layout/switch_bar.xml rename to MotoActions/res/layout/switch_bar.xml index 201920b..408d8f0 100644 --- a/LineageActions/res/layout/switch_bar.xml +++ b/MotoActions/res/layout/switch_bar.xml @@ -43,6 +43,6 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:background="@null" - android:theme="@style/LineageActions.SwitchBar" /> + android:theme="@style/MotoActions.SwitchBar" /> diff --git a/LineageActions/res/values-pt-rBR/strings.xml b/MotoActions/res/values-pt-rBR/strings.xml similarity index 100% rename from LineageActions/res/values-pt-rBR/strings.xml rename to MotoActions/res/values-pt-rBR/strings.xml diff --git a/LineageActions/res/values/array.xml b/MotoActions/res/values/array.xml similarity index 100% rename from LineageActions/res/values/array.xml rename to MotoActions/res/values/array.xml diff --git a/LineageActions/res/values/strings.xml b/MotoActions/res/values/strings.xml similarity index 100% rename from LineageActions/res/values/strings.xml rename to MotoActions/res/values/strings.xml diff --git a/LineageActions/res/values/styles.xml b/MotoActions/res/values/styles.xml similarity index 52% rename from LineageActions/res/values/styles.xml rename to MotoActions/res/values/styles.xml index 561c0b2..5fe26b1 100644 --- a/LineageActions/res/values/styles.xml +++ b/MotoActions/res/values/styles.xml @@ -17,42 +17,42 @@ --> - - - - - - - - diff --git a/LineageActions/res/values/symbols.xml b/MotoActions/res/values/symbols.xml similarity index 100% rename from LineageActions/res/values/symbols.xml rename to MotoActions/res/values/symbols.xml diff --git a/LineageActions/res/xml/actions_panel.xml b/MotoActions/res/xml/actions_panel.xml similarity index 100% rename from LineageActions/res/xml/actions_panel.xml rename to MotoActions/res/xml/actions_panel.xml diff --git a/LineageActions/res/xml/doze_panel.xml b/MotoActions/res/xml/doze_panel.xml similarity index 100% rename from LineageActions/res/xml/doze_panel.xml rename to MotoActions/res/xml/doze_panel.xml diff --git a/LineageActions/res/xml/doze_panel_indexable.xml b/MotoActions/res/xml/doze_panel_indexable.xml similarity index 100% rename from LineageActions/res/xml/doze_panel_indexable.xml rename to MotoActions/res/xml/doze_panel_indexable.xml diff --git a/LineageActions/res/xml/fp_gesture_panel.xml b/MotoActions/res/xml/fp_gesture_panel.xml similarity index 100% rename from LineageActions/res/xml/fp_gesture_panel.xml rename to MotoActions/res/xml/fp_gesture_panel.xml diff --git a/LineageActions/res/xml/fp_gesture_panel_indexable.xml b/MotoActions/res/xml/fp_gesture_panel_indexable.xml similarity index 100% rename from LineageActions/res/xml/fp_gesture_panel_indexable.xml rename to MotoActions/res/xml/fp_gesture_panel_indexable.xml diff --git a/LineageActions/res/xml/main_panel.xml b/MotoActions/res/xml/main_panel.xml similarity index 77% rename from LineageActions/res/xml/main_panel.xml rename to MotoActions/res/xml/main_panel.xml index 342bdc8..b1f9885 100644 --- a/LineageActions/res/xml/main_panel.xml +++ b/MotoActions/res/xml/main_panel.xml @@ -24,8 +24,8 @@ android:summary="@string/device_gestures_summary" android:icon="@drawable/ic_settings_gestures"> + android:targetPackage="com.moto.actions" + android:targetClass="com.moto.actions.GestureSettingsActivity" /> + android:targetPackage="com.moto.actions" + android:targetClass="com.moto.actions.DozeSettingsActivity" /> + android:targetPackage="com.moto.actions" + android:targetClass="com.moto.actions.FPGestureSettingsActivity" /> diff --git a/LineageActions/res/xml/screen_off_gesture_panel.xml b/MotoActions/res/xml/screen_off_gesture_panel.xml similarity index 100% rename from LineageActions/res/xml/screen_off_gesture_panel.xml rename to MotoActions/res/xml/screen_off_gesture_panel.xml diff --git a/LineageActions/res/xml/screen_off_gesture_panel_indexable.xml b/MotoActions/res/xml/screen_off_gesture_panel_indexable.xml similarity index 100% rename from LineageActions/res/xml/screen_off_gesture_panel_indexable.xml rename to MotoActions/res/xml/screen_off_gesture_panel_indexable.xml diff --git a/LineageActions/src/org/lineageos/settings/device/ActionsPreferenceActivity.java b/MotoActions/src/com/moto/actions/ActionsPreferenceActivity.java similarity index 96% rename from LineageActions/src/org/lineageos/settings/device/ActionsPreferenceActivity.java rename to MotoActions/src/com/moto/actions/ActionsPreferenceActivity.java index 2889b39..4bb316c 100644 --- a/LineageActions/src/org/lineageos/settings/device/ActionsPreferenceActivity.java +++ b/MotoActions/src/com/moto/actions/ActionsPreferenceActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.os.Bundle; diff --git a/LineageActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java b/MotoActions/src/com/moto/actions/ActionsPreferenceFragment.java similarity index 96% rename from LineageActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java rename to MotoActions/src/com/moto/actions/ActionsPreferenceFragment.java index e48047d..4e78965 100644 --- a/LineageActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java +++ b/MotoActions/src/com/moto/actions/ActionsPreferenceFragment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.os.Bundle; import android.support.v14.preference.PreferenceFragment; diff --git a/LineageActions/src/org/lineageos/settings/device/BootCompletedReceiver.java b/MotoActions/src/com/moto/actions/BootCompletedReceiver.java similarity index 88% rename from LineageActions/src/org/lineageos/settings/device/BootCompletedReceiver.java rename to MotoActions/src/com/moto/actions/BootCompletedReceiver.java index 8cd8b5d..45cb24a 100644 --- a/LineageActions/src/org/lineageos/settings/device/BootCompletedReceiver.java +++ b/MotoActions/src/com/moto/actions/BootCompletedReceiver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -27,12 +27,12 @@ import android.content.ServiceConnection; import android.os.IBinder; import android.util.Log; -import org.lineageos.settings.device.util.FileUtils; -import org.lineageos.settings.device.actions.Constants; -import org.lineageos.settings.device.ServiceWrapper.LocalBinder; +import com.moto.actions.util.FileUtils; +import com.moto.actions.actions.Constants; +import com.moto.actions.ServiceWrapper.LocalBinder; public class BootCompletedReceiver extends BroadcastReceiver { - static final String TAG = "LineageActions"; + static final String TAG = "MotoActions"; final String NAVBAR_SHOWN = "navbar_shown"; private ServiceWrapper mServiceWrapper; diff --git a/LineageActions/src/org/lineageos/settings/device/DozeSettingsActivity.java b/MotoActions/src/com/moto/actions/DozeSettingsActivity.java similarity index 96% rename from LineageActions/src/org/lineageos/settings/device/DozeSettingsActivity.java rename to MotoActions/src/com/moto/actions/DozeSettingsActivity.java index 2893658..f949cb8 100644 --- a/LineageActions/src/org/lineageos/settings/device/DozeSettingsActivity.java +++ b/MotoActions/src/com/moto/actions/DozeSettingsActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.os.Bundle; diff --git a/LineageActions/src/org/lineageos/settings/device/DozeSettingsFragment.java b/MotoActions/src/com/moto/actions/DozeSettingsFragment.java similarity index 91% rename from LineageActions/src/org/lineageos/settings/device/DozeSettingsFragment.java rename to MotoActions/src/com/moto/actions/DozeSettingsFragment.java index 547d803..988d005 100644 --- a/LineageActions/src/org/lineageos/settings/device/DozeSettingsFragment.java +++ b/MotoActions/src/com/moto/actions/DozeSettingsFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.app.ActionBar; import android.os.Bundle; @@ -63,7 +63,7 @@ public class DozeSettingsFragment extends PreferenceFragment { View switchBar = view.findViewById(R.id.switch_bar); mAmbientDisplaySwitch = (Switch) switchBar.findViewById(android.R.id.switch_widget); - mAmbientDisplaySwitch.setChecked(LineageActionsSettings.isDozeEnabled(getActivity().getContentResolver())); + mAmbientDisplaySwitch.setChecked(MotoActionsSettings.isDozeEnabled(getActivity().getContentResolver())); mAmbientDisplaySwitch.setOnCheckedChangeListener(mAmbientDisplayPrefListener); switchBar.setOnClickListener(new View.OnClickListener() { @@ -74,14 +74,14 @@ public class DozeSettingsFragment extends PreferenceFragment { }); mSwitchBarText = switchBar.findViewById(R.id.switch_text); - mSwitchBarText.setText(LineageActionsSettings.isDozeEnabled(getActivity().getContentResolver()) ? R.string.switch_bar_on : + mSwitchBarText.setText(MotoActionsSettings.isDozeEnabled(getActivity().getContentResolver()) ? R.string.switch_bar_on : R.string.switch_bar_off); } @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.doze_panel); - boolean dozeEnabled = LineageActionsSettings.isDozeEnabled(getActivity().getContentResolver()); + boolean dozeEnabled = MotoActionsSettings.isDozeEnabled(getActivity().getContentResolver()); mHandwavePreference = (SwitchPreference) findPreference(KEY_GESTURE_HAND_WAVE); mPickupPreference = (SwitchPreference) findPreference(KEY_GESTURE_PICK_UP); updatePrefs(dozeEnabled); diff --git a/LineageActions/src/org/lineageos/settings/device/FPGestureSettingsActivity.java b/MotoActions/src/com/moto/actions/FPGestureSettingsActivity.java similarity index 96% rename from LineageActions/src/org/lineageos/settings/device/FPGestureSettingsActivity.java rename to MotoActions/src/com/moto/actions/FPGestureSettingsActivity.java index afc424f..b3a07e0 100644 --- a/LineageActions/src/org/lineageos/settings/device/FPGestureSettingsActivity.java +++ b/MotoActions/src/com/moto/actions/FPGestureSettingsActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.os.Bundle; diff --git a/LineageActions/src/org/lineageos/settings/device/FPGestureSettingsFragment.java b/MotoActions/src/com/moto/actions/FPGestureSettingsFragment.java similarity index 95% rename from LineageActions/src/org/lineageos/settings/device/FPGestureSettingsFragment.java rename to MotoActions/src/com/moto/actions/FPGestureSettingsFragment.java index 4f6a22b..fba362c 100644 --- a/LineageActions/src/org/lineageos/settings/device/FPGestureSettingsFragment.java +++ b/MotoActions/src/com/moto/actions/FPGestureSettingsFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.app.ActionBar; import android.os.Bundle; @@ -33,10 +33,10 @@ import android.widget.CompoundButton; import android.widget.Switch; import android.widget.TextView; -import org.lineageos.settings.device.actions.Constants; +import com.moto.actions.actions.Constants; -import static org.lineageos.settings.device.actions.Constants.FP_HOME_KEY; -import static org.lineageos.settings.device.actions.Constants.FP_HOME_KEY_OFF; +import static com.moto.actions.actions.Constants.FP_HOME_KEY; +import static com.moto.actions.actions.Constants.FP_HOME_KEY_OFF; public class FPGestureSettingsFragment extends PreferenceFragment { diff --git a/LineageActions/src/org/lineageos/settings/device/GestureSettingsActivity.java b/MotoActions/src/com/moto/actions/GestureSettingsActivity.java similarity index 96% rename from LineageActions/src/org/lineageos/settings/device/GestureSettingsActivity.java rename to MotoActions/src/com/moto/actions/GestureSettingsActivity.java index 40c3291..90df10b 100644 --- a/LineageActions/src/org/lineageos/settings/device/GestureSettingsActivity.java +++ b/MotoActions/src/com/moto/actions/GestureSettingsActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.os.Bundle; diff --git a/LineageActions/src/org/lineageos/settings/device/GestureSettingsFragment.java b/MotoActions/src/com/moto/actions/GestureSettingsFragment.java similarity index 96% rename from LineageActions/src/org/lineageos/settings/device/GestureSettingsFragment.java rename to MotoActions/src/com/moto/actions/GestureSettingsFragment.java index 9a9bb14..9e421b2 100644 --- a/LineageActions/src/org/lineageos/settings/device/GestureSettingsFragment.java +++ b/MotoActions/src/com/moto/actions/GestureSettingsFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.os.Bundle; import android.support.v14.preference.PreferenceFragment; diff --git a/LineageActions/src/org/lineageos/settings/device/KeyHandler.java b/MotoActions/src/com/moto/actions/KeyHandler.java similarity index 99% rename from LineageActions/src/org/lineageos/settings/device/KeyHandler.java rename to MotoActions/src/com/moto/actions/KeyHandler.java index a5d242d..d330fc3 100644 --- a/LineageActions/src/org/lineageos/settings/device/KeyHandler.java +++ b/MotoActions/src/com/moto/actions/KeyHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.app.ActivityManager; import android.app.ActivityManagerNative; @@ -64,11 +64,11 @@ import android.widget.Toast; import com.android.internal.os.DeviceKeyHandler; import com.android.internal.util.ArrayUtils; -import org.lineageos.settings.device.util.FileUtils; +import com.moto.actions.util.FileUtils; import java.util.List; -import static org.lineageos.settings.device.actions.Constants.*; +import static com.moto.actions.actions.Constants.*; public class KeyHandler implements DeviceKeyHandler { @@ -607,8 +607,8 @@ public class KeyHandler implements DeviceKeyHandler { if (ai != null && !ai.supportsPictureInPicture()) { try { PackageManager pm = mContext.getPackageManager(); - Resources resources = pm.getResourcesForApplication("org.lineageos.settings.device"); - int resId = resources.getIdentifier("app_does_not_support_pip", "string", "org.lineageos.settings.device"); + Resources resources = pm.getResourcesForApplication("com.moto.actions"); + int resId = resources.getIdentifier("app_does_not_support_pip", "string", "com.moto.actions"); final String text = resources.getString(resId); mHandler.post(new Runnable() { public void run() { diff --git a/LineageActions/src/org/lineageos/settings/device/LineageActionsSearchIndexablesProvider.java b/MotoActions/src/com/moto/actions/MotoActionsSearchIndexablesProvider.java similarity index 92% rename from LineageActions/src/org/lineageos/settings/device/LineageActionsSearchIndexablesProvider.java rename to MotoActions/src/com/moto/actions/MotoActionsSearchIndexablesProvider.java index 631f425..2c48ba6 100644 --- a/LineageActions/src/org/lineageos/settings/device/LineageActionsSearchIndexablesProvider.java +++ b/MotoActions/src/com/moto/actions/MotoActionsSearchIndexablesProvider.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.database.Cursor; import android.database.MatrixCursor; @@ -33,8 +33,8 @@ import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; import static android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS; import static android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS; -public class LineageActionsSearchIndexablesProvider extends SearchIndexablesProvider { - private static final String TAG = "LineageActionsSearchIndexablesProvider"; +public class MotoActionsSearchIndexablesProvider extends SearchIndexablesProvider { + private static final String TAG = "MotoActionsSearchIndexablesProvider"; @Override public boolean onCreate() { @@ -73,7 +73,7 @@ public class LineageActionsSearchIndexablesProvider extends SearchIndexablesProv ref[COLUMN_INDEX_XML_RES_CLASS_NAME] = null; ref[COLUMN_INDEX_XML_RES_ICON_RESID] = sir.iconResId; ref[COLUMN_INDEX_XML_RES_INTENT_ACTION] = "com.android.settings.action.EXTRA_SETTINGS"; - ref[COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE] = "org.lineageos.settings.device"; + ref[COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE] = "com.moto.actions"; ref[COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS] = sir.className; return ref; } diff --git a/LineageActions/src/org/lineageos/settings/device/LineageActionsService.java b/MotoActions/src/com/moto/actions/MotoActionsService.java similarity index 60% rename from LineageActions/src/org/lineageos/settings/device/LineageActionsService.java rename to MotoActions/src/com/moto/actions/MotoActionsService.java index 4eb3829..0d0da89 100644 --- a/LineageActions/src/org/lineageos/settings/device/LineageActionsService.java +++ b/MotoActions/src/com/moto/actions/MotoActionsService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.app.IntentService; import android.content.Context; @@ -27,23 +27,23 @@ import android.util.Log; import java.util.List; import java.util.LinkedList; -import org.lineageos.settings.device.actions.UpdatedStateNotifier; -import org.lineageos.settings.device.actions.CameraActivationSensor; -import org.lineageos.settings.device.actions.ChopChopSensor; -import org.lineageos.settings.device.actions.FlipToMute; -import org.lineageos.settings.device.actions.LiftToSilence; -import org.lineageos.settings.device.actions.ProximitySilencer; +import com.moto.actions.actions.UpdatedStateNotifier; +import com.moto.actions.actions.CameraActivationSensor; +import com.moto.actions.actions.ChopChopSensor; +import com.moto.actions.actions.FlipToMute; +import com.moto.actions.actions.LiftToSilence; +import com.moto.actions.actions.ProximitySilencer; -import org.lineageos.settings.device.doze.DozePulseAction; -//import org.lineageos.settings.device.doze.GlanceSensor; -import org.lineageos.settings.device.doze.ProximitySensor; -import org.lineageos.settings.device.doze.ScreenReceiver; -import org.lineageos.settings.device.doze.ScreenStateNotifier; -import org.lineageos.settings.device.doze.StowSensor; +import com.moto.actions.doze.DozePulseAction; +//import com.moto.actions.doze.GlanceSensor; +import com.moto.actions.doze.ProximitySensor; +import com.moto.actions.doze.ScreenReceiver; +import com.moto.actions.doze.ScreenStateNotifier; +import com.moto.actions.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; @@ -57,13 +57,13 @@ public class LineageActionsService extends IntentService implements ScreenStateN private final List mUpdatedStateNotifiers = new LinkedList(); - 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); @@ -71,19 +71,19 @@ 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 GlanceSensor(motoActionsSettings, mSensorHelper, mDozePulseAction)); + mScreenStateNotifiers.add(new ProximitySensor(motoActionsSettings, mSensorHelper, mDozePulseAction)); + mScreenStateNotifiers.add(new StowSensor(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(); } diff --git a/LineageActions/src/org/lineageos/settings/device/LineageActionsSettings.java b/MotoActions/src/com/moto/actions/MotoActionsSettings.java similarity index 92% rename from LineageActions/src/org/lineageos/settings/device/LineageActionsSettings.java rename to MotoActions/src/com/moto/actions/MotoActionsSettings.java index c4d32ac..e67761e 100644 --- a/LineageActions/src/org/lineageos/settings/device/LineageActionsSettings.java +++ b/MotoActions/src/com/moto/actions/MotoActionsSettings.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.content.ContentResolver; import android.content.Context; @@ -25,13 +25,13 @@ import android.provider.Settings; import android.util.Log; -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; +import com.moto.actions.actions.Constants; +import com.moto.actions.actions.UpdatedStateNotifier; +import com.moto.actions.actions.CameraActivationAction; +import com.moto.actions.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"; @@ -52,7 +52,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); diff --git a/LineageActions/src/org/lineageos/settings/device/SensorAction.java b/MotoActions/src/com/moto/actions/SensorAction.java similarity index 94% rename from LineageActions/src/org/lineageos/settings/device/SensorAction.java rename to MotoActions/src/com/moto/actions/SensorAction.java index 4bc72c4..bb0a21e 100644 --- a/LineageActions/src/org/lineageos/settings/device/SensorAction.java +++ b/MotoActions/src/com/moto/actions/SensorAction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; public interface SensorAction { public void action(); diff --git a/LineageActions/src/org/lineageos/settings/device/SensorHelper.java b/MotoActions/src/com/moto/actions/SensorHelper.java similarity index 97% rename from LineageActions/src/org/lineageos/settings/device/SensorHelper.java rename to MotoActions/src/com/moto/actions/SensorHelper.java index 2328bdf..8a0d669 100644 --- a/LineageActions/src/org/lineageos/settings/device/SensorHelper.java +++ b/MotoActions/src/com/moto/actions/SensorHelper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import java.util.List; import java.io.FileOutputStream; @@ -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; diff --git a/LineageActions/src/org/lineageos/settings/device/ServiceWrapper.java b/MotoActions/src/com/moto/actions/ServiceWrapper.java similarity index 87% rename from LineageActions/src/org/lineageos/settings/device/ServiceWrapper.java rename to MotoActions/src/com/moto/actions/ServiceWrapper.java index de3609a..1724f58 100644 --- a/LineageActions/src/org/lineageos/settings/device/ServiceWrapper.java +++ b/MotoActions/src/com/moto/actions/ServiceWrapper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device; +package com.moto.actions; import android.content.Intent; import android.os.Binder; @@ -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 diff --git a/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java b/MotoActions/src/com/moto/actions/actions/CameraActivationAction.java similarity index 96% rename from LineageActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java rename to MotoActions/src/com/moto/actions/actions/CameraActivationAction.java index 3d58992..f8ddc09 100644 --- a/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java +++ b/MotoActions/src/com/moto/actions/actions/CameraActivationAction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.actions; +package com.moto.actions.actions; import java.util.List; @@ -32,10 +32,10 @@ import android.os.Vibrator; import android.provider.MediaStore; import android.util.Log; -import org.lineageos.settings.device.SensorAction; +import com.moto.actions.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; diff --git a/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java b/MotoActions/src/com/moto/actions/actions/CameraActivationSensor.java similarity index 71% rename from LineageActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java rename to MotoActions/src/com/moto/actions/actions/CameraActivationSensor.java index c83eb6c..a70975e 100644 --- a/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java +++ b/MotoActions/src/com/moto/actions/actions/CameraActivationSensor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.actions; +package com.moto.actions.actions; import java.util.List; @@ -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.SensorHelper; +import com.moto.actions.MotoActionsSettings; +import com.moto.actions.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 diff --git a/LineageActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java b/MotoActions/src/com/moto/actions/actions/ChopChopSensor.java similarity index 78% rename from LineageActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java rename to MotoActions/src/com/moto/actions/actions/ChopChopSensor.java index 0ccd641..f5bc3e3 100644 --- a/LineageActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java +++ b/MotoActions/src/com/moto/actions/actions/ChopChopSensor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.actions; +package com.moto.actions.actions; import java.util.List; @@ -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.SensorHelper; +import com.moto.actions.MotoActionsSettings; +import com.moto.actions.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 diff --git a/LineageActions/src/org/lineageos/settings/device/actions/Constants.java b/MotoActions/src/com/moto/actions/actions/Constants.java similarity index 98% rename from LineageActions/src/org/lineageos/settings/device/actions/Constants.java rename to MotoActions/src/com/moto/actions/actions/Constants.java index 492df9d..58a7c56 100644 --- a/LineageActions/src/org/lineageos/settings/device/actions/Constants.java +++ b/MotoActions/src/com/moto/actions/actions/Constants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.actions; +package com.moto.actions.actions; import java.util.HashMap; import java.util.Map; @@ -25,13 +25,13 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.util.Log; -import org.lineageos.settings.device.util.FileUtils; +import com.moto.actions.util.FileUtils; public class Constants { public static final boolean DEBUG = false; - private static final String TAG = "LineageActions"; + private static final String TAG = "MotoActions"; // FP gestures public static final int FP_TAP_SCANCODE = 616; diff --git a/LineageActions/src/org/lineageos/settings/device/actions/FlipToMute.java b/MotoActions/src/com/moto/actions/actions/FlipToMute.java similarity index 87% rename from LineageActions/src/org/lineageos/settings/device/actions/FlipToMute.java rename to MotoActions/src/com/moto/actions/actions/FlipToMute.java index 7db8154..b226a27 100644 --- a/LineageActions/src/org/lineageos/settings/device/actions/FlipToMute.java +++ b/MotoActions/src/com/moto/actions/actions/FlipToMute.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.actions; +package com.moto.actions.actions; import android.app.NotificationManager; import android.content.BroadcastReceiver; @@ -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.SensorHelper; +import com.moto.actions.MotoActionsSettings; +import com.moto.actions.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); diff --git a/LineageActions/src/org/lineageos/settings/device/actions/LiftToSilence.java b/MotoActions/src/com/moto/actions/actions/LiftToSilence.java similarity index 87% rename from LineageActions/src/org/lineageos/settings/device/actions/LiftToSilence.java rename to MotoActions/src/com/moto/actions/actions/LiftToSilence.java index 4fe671f..6b36dc2 100644 --- a/LineageActions/src/org/lineageos/settings/device/actions/LiftToSilence.java +++ b/MotoActions/src/com/moto/actions/actions/LiftToSilence.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.actions; +package com.moto.actions.actions; import android.content.Context; import android.hardware.Sensor; @@ -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.SensorHelper; +import com.moto.actions.MotoActionsSettings; +import com.moto.actions.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); diff --git a/LineageActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java b/MotoActions/src/com/moto/actions/actions/ProximitySilencer.java similarity index 87% rename from LineageActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java rename to MotoActions/src/com/moto/actions/actions/ProximitySilencer.java index 605aaf5..70a7813 100644 --- a/LineageActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java +++ b/MotoActions/src/com/moto/actions/actions/ProximitySilencer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.actions; +package com.moto.actions.actions; import android.content.Context; import android.hardware.Sensor; @@ -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.SensorHelper; +import com.moto.actions.MotoActionsSettings; +import com.moto.actions.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); diff --git a/LineageActions/src/org/lineageos/settings/device/actions/TorchAction.java b/MotoActions/src/com/moto/actions/actions/TorchAction.java similarity index 94% rename from LineageActions/src/org/lineageos/settings/device/actions/TorchAction.java rename to MotoActions/src/com/moto/actions/actions/TorchAction.java index c31bf34..064d9f7 100644 --- a/LineageActions/src/org/lineageos/settings/device/actions/TorchAction.java +++ b/MotoActions/src/com/moto/actions/actions/TorchAction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.actions; +package com.moto.actions.actions; import android.content.Context; import android.hardware.camera2.CameraManager; @@ -24,10 +24,10 @@ import android.hardware.camera2.CameraAccessException; import android.os.Vibrator; import android.util.Log; -import org.lineageos.settings.device.SensorAction; +import com.moto.actions.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; diff --git a/LineageActions/src/org/lineageos/settings/device/actions/UpdatedStateNotifier.java b/MotoActions/src/com/moto/actions/actions/UpdatedStateNotifier.java similarity index 93% rename from LineageActions/src/org/lineageos/settings/device/actions/UpdatedStateNotifier.java rename to MotoActions/src/com/moto/actions/actions/UpdatedStateNotifier.java index 224a57b..f260771 100644 --- a/LineageActions/src/org/lineageos/settings/device/actions/UpdatedStateNotifier.java +++ b/MotoActions/src/com/moto/actions/actions/UpdatedStateNotifier.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.actions; +package com.moto.actions.actions; public interface UpdatedStateNotifier { public void updateState(); diff --git a/LineageActions/src/org/lineageos/settings/device/doze/DozePulseAction.java b/MotoActions/src/com/moto/actions/doze/DozePulseAction.java similarity index 92% rename from LineageActions/src/org/lineageos/settings/device/doze/DozePulseAction.java rename to MotoActions/src/com/moto/actions/doze/DozePulseAction.java index 4445b28..6760951 100644 --- a/LineageActions/src/org/lineageos/settings/device/doze/DozePulseAction.java +++ b/MotoActions/src/com/moto/actions/doze/DozePulseAction.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.lineageos.settings.device.doze; +package com.moto.actions.doze; import android.content.Context; import android.content.Intent; import android.util.Log; -import org.lineageos.settings.device.SensorAction; +import com.moto.actions.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; diff --git a/LineageActions/src/org/lineageos/settings/device/doze/ProximitySensor.java b/MotoActions/src/com/moto/actions/doze/ProximitySensor.java similarity index 77% rename from LineageActions/src/org/lineageos/settings/device/doze/ProximitySensor.java rename to MotoActions/src/com/moto/actions/doze/ProximitySensor.java index dca3c41..6ee3cbc 100644 --- a/LineageActions/src/org/lineageos/settings/device/doze/ProximitySensor.java +++ b/MotoActions/src/com/moto/actions/doze/ProximitySensor.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package org.lineageos.settings.device.doze; +package com.moto.actions.doze; import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.util.Log; -import org.lineageos.settings.device.LineageActionsSettings; -import org.lineageos.settings.device.SensorAction; -import org.lineageos.settings.device.SensorHelper; +import com.moto.actions.MotoActionsSettings; +import com.moto.actions.SensorAction; +import com.moto.actions.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; diff --git a/LineageActions/src/org/lineageos/settings/device/doze/ScreenReceiver.java b/MotoActions/src/com/moto/actions/doze/ScreenReceiver.java similarity index 93% rename from LineageActions/src/org/lineageos/settings/device/doze/ScreenReceiver.java rename to MotoActions/src/com/moto/actions/doze/ScreenReceiver.java index cec01d0..4281342 100644 --- a/LineageActions/src/org/lineageos/settings/device/doze/ScreenReceiver.java +++ b/MotoActions/src/com/moto/actions/doze/ScreenReceiver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.doze; +package com.moto.actions.doze; import java.util.List; @@ -24,7 +24,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import org.lineageos.settings.device.actions.Constants; +import com.moto.actions.actions.Constants; public class ScreenReceiver extends BroadcastReceiver { private final ScreenStateNotifier mNotifier; diff --git a/LineageActions/src/org/lineageos/settings/device/doze/ScreenStateNotifier.java b/MotoActions/src/com/moto/actions/doze/ScreenStateNotifier.java similarity index 94% rename from LineageActions/src/org/lineageos/settings/device/doze/ScreenStateNotifier.java rename to MotoActions/src/com/moto/actions/doze/ScreenStateNotifier.java index 7b9ab59..c87b813 100644 --- a/LineageActions/src/org/lineageos/settings/device/doze/ScreenStateNotifier.java +++ b/MotoActions/src/com/moto/actions/doze/ScreenStateNotifier.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.doze; +package com.moto.actions.doze; public interface ScreenStateNotifier { public void screenTurnedOn(); diff --git a/LineageActions/src/org/lineageos/settings/device/doze/StowSensor.java b/MotoActions/src/com/moto/actions/doze/StowSensor.java similarity index 79% rename from LineageActions/src/org/lineageos/settings/device/doze/StowSensor.java rename to MotoActions/src/com/moto/actions/doze/StowSensor.java index 74c22fe..0d88b20 100644 --- a/LineageActions/src/org/lineageos/settings/device/doze/StowSensor.java +++ b/MotoActions/src/com/moto/actions/doze/StowSensor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.doze; +package com.moto.actions.doze; import android.hardware.Sensor; import android.hardware.SensorEvent; @@ -24,15 +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; +import com.moto.actions.MotoActionsSettings; +import com.moto.actions.SensorAction; +import com.moto.actions.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; diff --git a/LineageActions/src/org/lineageos/settings/device/util/FileUtils.java b/MotoActions/src/com/moto/actions/util/FileUtils.java similarity index 98% rename from LineageActions/src/org/lineageos/settings/device/util/FileUtils.java rename to MotoActions/src/com/moto/actions/util/FileUtils.java index 4993c94..dec3446 100644 --- a/LineageActions/src/org/lineageos/settings/device/util/FileUtils.java +++ b/MotoActions/src/com/moto/actions/util/FileUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.lineageos.settings.device.util; +package com.moto.actions.util; import android.util.Log; diff --git a/device.mk b/device.mk index 4a7a602..260f681 100644 --- a/device.mk +++ b/device.mk @@ -133,9 +133,9 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/gps/etc/xtwifi.conf:system/vendor/etc/xtwifi.conf \ $(LOCAL_PATH)/gps/etc/cacert_location.pem:system/vendor/etc/cacert_location.pem -# LineageActions +# MotoActions PRODUCT_PACKAGES += \ - LineageActions + MotoActions # Display PRODUCT_PACKAGES += \ diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 8902cc9..472228c 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -309,10 +309,10 @@ false - /system/priv-app/LineageActions/LineageActions.apk + /system/priv-app/MotoActions/MotoActions.apk - org.lineageos.settings.device.KeyHandler + com.moto.actions.KeyHandler true