From f89d46563fccb7ef09dce3c081c3fd1e3f01b3a3 Mon Sep 17 00:00:00 2001 From: Patrick Lower Date: Mon, 11 May 2015 16:14:17 -0400 Subject: [PATCH] AmbientDisplay: Enable Ambient Display for klte. * Set configuration overlays to turn on ambient display * Added custom service that uses proximity sensor in wake-up mode to trigger display on * If more sensor triggers are suitable to use, they can be added to the service Change-Id: Id0849fb5c17ff569d771a19cebfc579dc93dbc48 --- doze/Android.mk | 16 ++ doze/AndroidManifest.xml | 47 +++++ doze/proguard.flags | 3 + doze/res/values/strings.xml | 26 +++ doze/res/xml/gesture_panel.xml | 28 +++ .../device/BootCompletedReceiver.java | 35 ++++ .../settings/device/KlteDozeService.java | 190 ++++++++++++++++++ .../device/TouchscreenGestureSettings.java | 41 ++++ klte.mk | 4 + .../base/core/res/res/values/config.xml | 7 + 10 files changed, 397 insertions(+) create mode 100644 doze/Android.mk create mode 100644 doze/AndroidManifest.xml create mode 100644 doze/proguard.flags create mode 100644 doze/res/values/strings.xml create mode 100644 doze/res/xml/gesture_panel.xml create mode 100644 doze/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java create mode 100644 doze/src/com/cyanogenmod/settings/device/KlteDozeService.java create mode 100644 doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java diff --git a/doze/Android.mk b/doze/Android.mk new file mode 100644 index 0000000..b7d82eb --- /dev/null +++ b/doze/Android.mk @@ -0,0 +1,16 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_PACKAGE_NAME := KlteDoze +LOCAL_CERTIFICATE := platform +LOCAL_PRIVILEGED_MODULE := true + +LOCAL_PROGUARD_FLAG_FILES := proguard.flags + +include $(BUILD_PACKAGE) + +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/doze/AndroidManifest.xml b/doze/AndroidManifest.xml new file mode 100644 index 0000000..2f67312 --- /dev/null +++ b/doze/AndroidManifest.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + > + + + + + + + + + diff --git a/doze/proguard.flags b/doze/proguard.flags new file mode 100644 index 0000000..3bb1f2c --- /dev/null +++ b/doze/proguard.flags @@ -0,0 +1,3 @@ +-keep class com.cyanogenmod.settings.device.* { + *; +} diff --git a/doze/res/values/strings.xml b/doze/res/values/strings.xml new file mode 100644 index 0000000..2b54bfb --- /dev/null +++ b/doze/res/values/strings.xml @@ -0,0 +1,26 @@ + + + + + + Gestures + Use gestures to perform actions + + Hand wave + Pulse notifications on hand wave + + Pocket + Pulse notifications on removal from pocket + + diff --git a/doze/res/xml/gesture_panel.xml b/doze/res/xml/gesture_panel.xml new file mode 100644 index 0000000..29963d1 --- /dev/null +++ b/doze/res/xml/gesture_panel.xml @@ -0,0 +1,28 @@ + + + + + + + + + diff --git a/doze/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java b/doze/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java new file mode 100644 index 0000000..e8e3dd7 --- /dev/null +++ b/doze/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2015 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 com.cyanogenmod.settings.device; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.util.Log; + +public class BootCompletedReceiver extends BroadcastReceiver { + + private static final boolean DEBUG = false; + private static final String TAG = "KlteDoze"; + + @Override + public void onReceive(final Context context, Intent intent) { + if (DEBUG) Log.d(TAG, "Starting service"); + context.startService(new Intent(context, KlteDozeService.class)); + } + +} diff --git a/doze/src/com/cyanogenmod/settings/device/KlteDozeService.java b/doze/src/com/cyanogenmod/settings/device/KlteDozeService.java new file mode 100644 index 0000000..23b4656 --- /dev/null +++ b/doze/src/com/cyanogenmod/settings/device/KlteDozeService.java @@ -0,0 +1,190 @@ +/* + * Copyright (c) 2015 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 com.cyanogenmod.settings.device; + +import android.app.Service; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.SharedPreferences; +import android.hardware.Sensor; +import android.hardware.SensorEvent; +import android.hardware.SensorEventListener; +import android.hardware.SensorManager; +import android.os.IBinder; +import android.os.PowerManager; +import android.preference.PreferenceManager; +import android.provider.Settings; +import android.util.Log; + +import java.util.ArrayList; +import java.util.List; + +public class KlteDozeService extends Service { + private static final String TAG = "KlteDozeService"; + private static final boolean DEBUG = false; + + private static final String DOZE_INTENT = "com.android.systemui.doze.pulse"; + + private static final String GESTURE_HAND_WAVE_KEY = "gesture_hand_wave"; + private static final String GESTURE_POCKET_KEY = "gesture_pocket"; + + private static final int POCKET_DELTA_NS = 1000 * 1000 * 1000; + + private Context mContext; + private KlteProximitySensor mSensor; + private PowerManager mPowerManager; + + private boolean mHandwaveGestureEnabled = false; + private boolean mPocketGestureEnabled = false; + + class KlteProximitySensor implements SensorEventListener { + private SensorManager mSensorManager; + private Sensor mSensor; + + private boolean mSawNear = false; + private long mInPocketTime = 0; + + public KlteProximitySensor(Context context) { + mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE); + mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY); + } + + @Override + public void onSensorChanged(SensorEvent event) { + boolean isNear = event.values[0] < mSensor.getMaximumRange(); + if (mSawNear && !isNear) { + if (shouldPulse(event.timestamp)) { + launchDozePulse(); + } + } else { + mInPocketTime = event.timestamp; + } + mSawNear = isNear; + } + + @Override + public void onAccuracyChanged(Sensor sensor, int accuracy) { + /* Empty */ + } + + private boolean shouldPulse(long timestamp) { + long delta = timestamp - mInPocketTime; + + if (mHandwaveGestureEnabled && mPocketGestureEnabled) { + return true; + } else if (mHandwaveGestureEnabled && !mPocketGestureEnabled) { + return delta < POCKET_DELTA_NS; + } else if (!mHandwaveGestureEnabled && mPocketGestureEnabled) { + return delta >= POCKET_DELTA_NS; + } + return false; + } + + public void enable() { + if (mHandwaveGestureEnabled) { + mSensorManager.registerListener(this, mSensor, SensorManager.SENSOR_DELAY_NORMAL); + } + } + + public void disable() { + mSensorManager.unregisterListener(this, mSensor); + } + } + + @Override + public void onCreate() { + if (DEBUG) Log.d(TAG, "KlteDozeService Started"); + mContext = this; + mPowerManager = (PowerManager)getSystemService(Context.POWER_SERVICE); + mSensor = new KlteProximitySensor(mContext); + SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(mContext); + loadPreferences(sharedPrefs); + sharedPrefs.registerOnSharedPreferenceChangeListener(mPrefListener); + if (!isInteractive() && isDozeEnabled()) { + mSensor.enable(); + } + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + if (DEBUG) Log.d(TAG, "Starting service"); + IntentFilter screenStateFilter = new IntentFilter(Intent.ACTION_SCREEN_ON); + screenStateFilter.addAction(Intent.ACTION_SCREEN_OFF); + mContext.registerReceiver(mScreenStateReceiver, screenStateFilter); + return START_STICKY; + } + + @Override + public IBinder onBind(Intent intent) { + return null; + } + + private void launchDozePulse() { + mContext.sendBroadcast(new Intent(DOZE_INTENT)); + } + + private boolean isInteractive() { + return mPowerManager.isInteractive(); + } + + private boolean isDozeEnabled() { + return Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.DOZE_ENABLED, 1) != 0; + } + + private void onDisplayOn() { + if (DEBUG) Log.d(TAG, "Display on"); + mSensor.disable(); + } + + private void onDisplayOff() { + if (DEBUG) Log.d(TAG, "Display off"); + if (isDozeEnabled()) { + mSensor.enable(); + } + } + + private void loadPreferences(SharedPreferences sharedPreferences) { + mHandwaveGestureEnabled = sharedPreferences.getBoolean(GESTURE_HAND_WAVE_KEY, true); + mPocketGestureEnabled = sharedPreferences.getBoolean(GESTURE_POCKET_KEY, true); + } + + private BroadcastReceiver mScreenStateReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) { + onDisplayOff(); + } else if (intent.getAction().equals(Intent.ACTION_SCREEN_ON)) { + onDisplayOn(); + } + } + }; + + private SharedPreferences.OnSharedPreferenceChangeListener mPrefListener = + new SharedPreferences.OnSharedPreferenceChangeListener() { + @Override + public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { + if (GESTURE_HAND_WAVE_KEY.equals(key)) { + mHandwaveGestureEnabled = sharedPreferences.getBoolean(GESTURE_HAND_WAVE_KEY, true); + } else if (GESTURE_POCKET_KEY.equals(key)) { + mPocketGestureEnabled = sharedPreferences.getBoolean(key, true); + } + } + }; +} diff --git a/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java b/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java new file mode 100644 index 0000000..bb40546 --- /dev/null +++ b/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2015 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 com.cyanogenmod.settings.device; + +import com.android.internal.util.cm.ScreenType; + +import android.os.Bundle; +import android.preference.PreferenceActivity; + +public class TouchscreenGestureSettings extends PreferenceActivity { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.gesture_panel); + } + + @Override + protected void onResume() { + super.onResume(); + + // If running on a phone, remove padding around the listview + if (!ScreenType.isTablet(this)) { + getListView().setPadding(0, 0, 0, 0); + } + } +} diff --git a/klte.mk b/klte.mk index 19feb0e..1988bcc 100644 --- a/klte.mk +++ b/klte.mk @@ -60,6 +60,10 @@ PRODUCT_PACKAGES += \ camera.msm8974 \ libxml2 +# Doze +PRODUCT_PACKAGES += \ + KlteDoze + # GPS PRODUCT_PACKAGES += \ gps.msm8974 diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index ea0d7c6..9afb615 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -83,6 +83,13 @@ The user is forbidden from setting the brightness below this level. --> 10 + + 17 + + + com.android.systemui/com.android.systemui.doze.DozeService + true +