Merge pull request #25 from y3seker/cm-12.1

Fix: gestures reset after boot

3 files changed, 1 insertions, 22 deletions

diff --git a/cmactions/AndroidManifest.xml b/cmactions/AndroidManifest.xml
index 7adc1dc..954e431 100644
--- a/cmactions/AndroidManifest.xml
+++ b/cmactions/AndroidManifest.xml
@@ -26,12 +26,6 @@
             </intent-filter>
         </receiver>
 
-        <service android:name="ServiceWrapper" android:permission="ServiceWrapper">
-            <intent-filter>
-                <action android:name="ServiceWrapper"/>
-            </intent-filter>
-        </service>
-
         <!-- stub to ensure its loaded - DO NOT REMOVE -->
         <activity android:name=".KeyHandler"/>
 
diff --git a/cmactions/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java b/cmactions/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java
index 2862fd9..c52ca65 100644
--- a/cmactions/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java
+++ b/cmactions/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java
@@ -32,6 +32,7 @@ public class BootCompletedReceiver extends BroadcastReceiver {
     public void onReceive(final Context context, Intent intent) {
         Log.d(TAG, "Booting");
         enableComponent(context, TouchscreenGestureSettings.class.getName());
+        GestureController.updateGestureControl(context);
     }
 
     private void enableComponent(Context context, String component) {
diff --git a/cmactions/src/com/cyanogenmod/settings/device/GestureController.java b/cmactions/src/com/cyanogenmod/settings/device/GestureController.java
index b262cf6..2cef1a3 100644
--- a/cmactions/src/com/cyanogenmod/settings/device/GestureController.java
+++ b/cmactions/src/com/cyanogenmod/settings/device/GestureController.java
@@ -76,22 +76,6 @@ public class GestureController {
         keysToMasks.put(UNICODE_Z, 0x400000);
     }
 
-    private static SharedPreferences.OnSharedPreferenceChangeListener mPrefListener;
-
-    public GestureController(final Context context) {
-        updateGestureControl(context);
-
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-        mPrefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-            @Override
-            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-                updateGestureControl(context);
-            }
-        };
-        sharedPrefs.registerOnSharedPreferenceChangeListener(mPrefListener);
-
-    }
-
     public static void updateGestureControl(Context context) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         if (sharedPreferences.getBoolean(TOUCHSCREEN_GESTURE_CONTROL_KEY, false)) {