From e798b625a75a665a989c5f0ace1f81a2a3e22b6b Mon Sep 17 00:00:00 2001 From: Dave Daynard Date: Mon, 25 May 2015 12:54:00 -0400 Subject: [PATCH] samsung: doze: add proximity wake Change-Id: Ib02f4611e7b8bc09d540ca5c49aab68ef27f188b --- doze/AndroidManifest.xml | 1 + doze/res/values/strings.xml | 5 +++++ doze/res/xml/gesture_panel.xml | 11 ++++++++++ .../settings/device/SamsungDozeService.java | 21 ++++++++++++------- .../device/TouchscreenGestureSettings.java | 21 +++++++++++++++++++ 5 files changed, 52 insertions(+), 7 deletions(-) diff --git a/doze/AndroidManifest.xml b/doze/AndroidManifest.xml index 804b80db..0bcc51f9 100644 --- a/doze/AndroidManifest.xml +++ b/doze/AndroidManifest.xml @@ -5,6 +5,7 @@ android:versionName="1.0" android:sharedUserId="android.uid.system"> + diff --git a/doze/res/values/strings.xml b/doze/res/values/strings.xml index 273a2116..6c2d2644 100644 --- a/doze/res/values/strings.xml +++ b/doze/res/values/strings.xml @@ -28,4 +28,9 @@ Pocket Pulse notifications on removal from pocket + Proximity wake + + Proximity wake + Wake device on hand wave + diff --git a/doze/res/xml/gesture_panel.xml b/doze/res/xml/gesture_panel.xml index ba48f9d4..40a017ce 100644 --- a/doze/res/xml/gesture_panel.xml +++ b/doze/res/xml/gesture_panel.xml @@ -39,4 +39,15 @@ android:summary="@string/pocket_gesture_summary" /> + + + + + \ No newline at end of file diff --git a/doze/src/com/cyanogenmod/settings/device/SamsungDozeService.java b/doze/src/com/cyanogenmod/settings/device/SamsungDozeService.java index f5595443..6d40cf14 100644 --- a/doze/src/com/cyanogenmod/settings/device/SamsungDozeService.java +++ b/doze/src/com/cyanogenmod/settings/device/SamsungDozeService.java @@ -33,6 +33,7 @@ import android.provider.Settings; import android.util.Log; import java.util.ArrayList; +import java.util.concurrent.TimeUnit; import java.util.List; public class SamsungDozeService extends Service { @@ -43,6 +44,7 @@ public class SamsungDozeService extends Service { private static final String GESTURE_HAND_WAVE_KEY = "gesture_hand_wave"; private static final String GESTURE_POCKET_KEY = "gesture_pocket"; + private static final String PROXIMITY_WAKE_KEY = "proximity_wake_enable"; private static final int POCKET_DELTA_NS = 1000 * 1000 * 1000; @@ -52,6 +54,7 @@ public class SamsungDozeService extends Service { private boolean mHandwaveGestureEnabled = false; private boolean mPocketGestureEnabled = false; + private boolean mProximityWakeEnabled = false; class SamsungProximitySensor implements SensorEventListener { private SensorManager mSensorManager; @@ -88,6 +91,9 @@ public class SamsungDozeService extends Service { if (mHandwaveGestureEnabled && mPocketGestureEnabled) { return true; + } else if (mProximityWakeEnabled && (delta < POCKET_DELTA_NS)) { + mPowerManager.wakeUp(TimeUnit.NANOSECONDS.toMillis(timestamp)); + return false; } else if (mHandwaveGestureEnabled && !mPocketGestureEnabled) { return delta < POCKET_DELTA_NS; } else if (!mHandwaveGestureEnabled && mPocketGestureEnabled) { @@ -96,8 +102,9 @@ public class SamsungDozeService extends Service { return false; } - public void enable() { - if (mHandwaveGestureEnabled || mPocketGestureEnabled) { + public void testAndEnable() { + if ((isDozeEnabled() && (mHandwaveGestureEnabled || mPocketGestureEnabled)) || + mProximityWakeEnabled) { mSensorManager.registerListener(this, mSensor, SensorManager.SENSOR_DELAY_NORMAL); } } @@ -116,8 +123,8 @@ public class SamsungDozeService extends Service { SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(mContext); loadPreferences(sharedPrefs); sharedPrefs.registerOnSharedPreferenceChangeListener(mPrefListener); - if (!isInteractive() && isDozeEnabled()) { - mSensor.enable(); + if (!isInteractive()) { + mSensor.testAndEnable(); } } @@ -155,9 +162,7 @@ public class SamsungDozeService extends Service { private void onDisplayOff() { if (DEBUG) Log.d(TAG, "Display off"); - if (isDozeEnabled()) { - mSensor.enable(); - } + mSensor.testAndEnable(); } private void loadPreferences(SharedPreferences sharedPreferences) { @@ -184,6 +189,8 @@ public class SamsungDozeService extends Service { mHandwaveGestureEnabled = sharedPreferences.getBoolean(GESTURE_HAND_WAVE_KEY, false); } else if (GESTURE_POCKET_KEY.equals(key)) { mPocketGestureEnabled = sharedPreferences.getBoolean(GESTURE_POCKET_KEY, false); + } else if (PROXIMITY_WAKE_KEY.equals(key)) { + mProximityWakeEnabled = sharedPreferences.getBoolean(PROXIMITY_WAKE_KEY, false); } } }; diff --git a/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java b/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java index dc184225..5b69988f 100644 --- a/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java +++ b/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java @@ -32,10 +32,12 @@ public class TouchscreenGestureSettings extends PreferenceActivity { private static final String KEY_AMBIENT_DISPLAY_ENABLE = "ambient_display_enable"; private static final String KEY_HAND_WAVE = "gesture_hand_wave"; private static final String KEY_GESTURE_POCKET = "gesture_pocket"; + private static final String KEY_PROXIMITY_WAKE = "proximity_wake_enable"; private SwitchPreference mAmbientDisplayPreference; private SwitchPreference mHandwavePreference; private SwitchPreference mPocketPreference; + private SwitchPreference mProximityWakePreference; @Override public void onCreate(Bundle savedInstanceState) { @@ -50,9 +52,13 @@ public class TouchscreenGestureSettings extends PreferenceActivity { mHandwavePreference = (SwitchPreference) findPreference(KEY_HAND_WAVE); mHandwavePreference.setEnabled(dozeEnabled); + mHandwavePreference.setOnPreferenceChangeListener(mProximityListener); mPocketPreference = (SwitchPreference) findPreference(KEY_GESTURE_POCKET); mPocketPreference.setEnabled(dozeEnabled); + mProximityWakePreference = + (SwitchPreference) findPreference(KEY_PROXIMITY_WAKE); + mProximityWakePreference.setOnPreferenceChangeListener(mProximityListener); final ActionBar actionBar = getActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); @@ -100,4 +106,19 @@ public class TouchscreenGestureSettings extends PreferenceActivity { return ret; } }; + + private Preference.OnPreferenceChangeListener mProximityListener = + new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + if ((boolean) newValue) { + if (preference.getKey().equals(KEY_HAND_WAVE)) { + mProximityWakePreference.setChecked(false); + } else if (preference.getKey().equals(KEY_PROXIMITY_WAKE)) { + mHandwavePreference.setChecked(false); + } + } + return true; + } + }; }