From 3ac5c14c4f29c3198dd3fb62f89609e1a1be1d3c Mon Sep 17 00:00:00 2001
From: Patrick Harbers <jgrharbers@gmail.com>
Date: Wed, 27 Dec 2017 00:09:36 +0100
Subject: [PATCH] doze: Upgrade MotoDoze to CMActions

Change-Id: Ied03fa1acf9dedb2a35fd25ad527a2ff890c1f77
---
 device.mk                                     |   2 +-
 modules/CMActions/Android.mk                  |  41 ++
 modules/CMActions/AndroidManifest.xml         |  45 +++
 modules/CMActions/proguard.flags              |   9 +
 .../res/drawable/switchbar_background.xml     |  21 +
 .../res/layout/settings_main_prefs.xml        |  85 ++++
 modules/CMActions/res/layout/switch_bar.xml   |  49 +++
 modules/CMActions/res/values/attrs.xml        |  22 ++
 modules/CMActions/res/values/colors.xml       |   4 +
 modules/CMActions/res/values/dimens.xml       |  23 ++
 modules/CMActions/res/values/strings.xml      |  20 +
 modules/CMActions/res/values/styles.xml       |  39 ++
 .../res/xml/gesture_panel.xml                 |  28 +-
 .../cmactions/CMActionsReceiver.java          |  68 ++++
 .../cmactions/CMActionsService.java           | 333 ++++++++++++++++
 .../com/cyanogenmod/cmactions/Constants.java  |  28 ++
 .../cmactions/GesturePreferenceActivity.java  |  51 +++
 .../cmactions/GesturePreferenceFragment.java  | 109 +++++
 .../cmactions/widget/SwitchBar.java           | 371 ++++++++++++++++++
 .../cmactions/widget/ToggleSwitch.java        |  63 +++
 modules/doze/Android.mk                       |  23 --
 modules/doze/AndroidManifest.xml              |  46 ---
 modules/doze/proguard.flags                   |   3 -
 .../res/drawable/ic_settings_gestures.xml     |  32 --
 .../device/BootCompletedReceiver.java         |  35 --
 .../settings/device/MotoDozeService.java      | 190 ---------
 .../device/TouchscreenGestureSettings.java    | 104 -----
 .../base/core/res/res/values/config.xml       |   4 +
 28 files changed, 1399 insertions(+), 449 deletions(-)
 create mode 100644 modules/CMActions/Android.mk
 create mode 100644 modules/CMActions/AndroidManifest.xml
 create mode 100644 modules/CMActions/proguard.flags
 create mode 100644 modules/CMActions/res/drawable/switchbar_background.xml
 create mode 100644 modules/CMActions/res/layout/settings_main_prefs.xml
 create mode 100644 modules/CMActions/res/layout/switch_bar.xml
 create mode 100644 modules/CMActions/res/values/attrs.xml
 create mode 100644 modules/CMActions/res/values/colors.xml
 create mode 100644 modules/CMActions/res/values/dimens.xml
 create mode 100644 modules/CMActions/res/values/strings.xml
 create mode 100644 modules/CMActions/res/values/styles.xml
 rename modules/{doze => CMActions}/res/xml/gesture_panel.xml (60%)
 create mode 100644 modules/CMActions/src/com/cyanogenmod/cmactions/CMActionsReceiver.java
 create mode 100644 modules/CMActions/src/com/cyanogenmod/cmactions/CMActionsService.java
 create mode 100644 modules/CMActions/src/com/cyanogenmod/cmactions/Constants.java
 create mode 100644 modules/CMActions/src/com/cyanogenmod/cmactions/GesturePreferenceActivity.java
 create mode 100644 modules/CMActions/src/com/cyanogenmod/cmactions/GesturePreferenceFragment.java
 create mode 100644 modules/CMActions/src/com/cyanogenmod/cmactions/widget/SwitchBar.java
 create mode 100644 modules/CMActions/src/com/cyanogenmod/cmactions/widget/ToggleSwitch.java
 delete mode 100644 modules/doze/Android.mk
 delete mode 100644 modules/doze/AndroidManifest.xml
 delete mode 100644 modules/doze/proguard.flags
 delete mode 100644 modules/doze/res/drawable/ic_settings_gestures.xml
 delete mode 100644 modules/doze/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java
 delete mode 100644 modules/doze/src/com/cyanogenmod/settings/device/MotoDozeService.java
 delete mode 100644 modules/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java

diff --git a/device.mk b/device.mk
index a373d1f..6a33386 100644
--- a/device.mk
+++ b/device.mk
@@ -49,7 +49,7 @@ PRODUCT_PACKAGES += \
 
 # Doze
 PRODUCT_PACKAGES += \
-   MotoDoze
+   CMActions
 
 # Radio
 PRODUCT_PACKAGES += \
diff --git a/modules/CMActions/Android.mk b/modules/CMActions/Android.mk
new file mode 100644
index 0000000..63cc750
--- /dev/null
+++ b/modules/CMActions/Android.mk
@@ -0,0 +1,41 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CMActions
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-v14-preference \
+    android-support-v7-appcompat \
+    android-support-v7-preference \
+    android-support-v7-recyclerview \
+    org.cyanogenmod.platform.internal
+
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+LOCAL_RESOURCE_DIR := \
+    $(LOCAL_PATH)/res \
+    $(LOCAL_PATH)/../../../../../packages/resources/devicesettings/res \
+    frameworks/support/v14/preference/res \
+    frameworks/support/v7/appcompat/res \
+    frameworks/support/v7/preference/res \
+    frameworks/support/v7/recyclerview/res
+
+LOCAL_AAPT_FLAGS := --auto-add-overlay \
+    --extra-packages android.support.v14.preference:android.support.v7.appcompat:android.support.v7.preference:android.support.v7.recyclerview
+
+ifneq ($(INCREMENTAL_BUILDS),)
+    LOCAL_PROGUARD_ENABLED := disabled
+    LOCAL_JACK_ENABLED := incremental
+endif
+
+include frameworks/base/packages/SettingsLib/common.mk
+
+include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/modules/CMActions/AndroidManifest.xml b/modules/CMActions/AndroidManifest.xml
new file mode 100644
index 0000000..fbf121b
--- /dev/null
+++ b/modules/CMActions/AndroidManifest.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.cyanogenmod.cmactions"
+    android:sharedUserId="android.uid.system">
+
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <protected-broadcast android:name="com.android.systemui.doze.pulse" />
+
+    <application
+        android:label="@string/device_settings_app_name"
+        android:persistent="true">
+
+        <receiver android:name=".CMActionsReceiver">
+            <intent-filter>
+                <action android:name="cyanogenmod.intent.action.UPDATE_PREFERENCE" />
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
+        <service android:name="com.cyanogenmod.cmactions.CMActionsService"
+                 android:permission="CMActionsService">
+        </service>
+
+        <activity
+            android:name=".GesturePreferenceActivity"
+            android:label="@string/ambient_display_title"
+            android:theme="@style/CMActions">
+            <intent-filter>
+                <action android:name="org.cyanogenmod.settings.device.DOZE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data
+                android:name="org.cyanogenmod.settings.summary.receiver"
+                android:value="com.cyanogenmod.cmactions.CMActionsReceiver" />
+            <meta-data
+                android:name="org.cyanogenmod.settings.summary.key"
+                android:value="doze_device_settings" />
+        </activity>
+
+    </application>
+</manifest>
diff --git a/modules/CMActions/proguard.flags b/modules/CMActions/proguard.flags
new file mode 100644
index 0000000..b23afd2
--- /dev/null
+++ b/modules/CMActions/proguard.flags
@@ -0,0 +1,9 @@
+-keep class com.cyanogenmod.CMActions.* {
+  *;
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keep class ** extends android.support.v14.preference.PreferenceFragment
diff --git a/modules/CMActions/res/drawable/switchbar_background.xml b/modules/CMActions/res/drawable/switchbar_background.xml
new file mode 100644
index 0000000..a58f2e9
--- /dev/null
+++ b/modules/CMActions/res/drawable/switchbar_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source 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.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:drawable="?android:attr/colorSecondary" />
+</ripple>
+
diff --git a/modules/CMActions/res/layout/settings_main_prefs.xml b/modules/CMActions/res/layout/settings_main_prefs.xml
new file mode 100644
index 0000000..4e4fc99
--- /dev/null
+++ b/modules/CMActions/res/layout/settings_main_prefs.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2014, The Android Open Source 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.
+*/
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_height="0px"
+        android:layout_width="match_parent"
+        android:layout_weight="1">
+
+        <com.cyanogenmod.cmactions.widget.SwitchBar android:id="@+id/switch_bar"
+            android:layout_height="?android:attr/actionBarSize"
+            android:layout_width="match_parent"
+            android:background="@drawable/switchbar_background"
+            android:theme="?attr/switchBarTheme"
+            />
+
+        <FrameLayout
+            android:id="@+id/main_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+
+    </LinearLayout>
+
+    <RelativeLayout android:id="@+id/button_bar"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_weight="0"
+        android:visibility="gone">
+
+        <Button android:id="@+id/back_button"
+            android:layout_width="150dip"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dip"
+            android:layout_alignParentStart="true"
+            android:text="@*android:string/back_button_label"
+            />
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true">
+
+            <Button android:id="@+id/skip_button"
+                android:layout_width="150dip"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dip"
+                android:text="@*android:string/skip_button_label"
+                android:visibility="gone"
+                />
+
+            <Button android:id="@+id/next_button"
+                android:layout_width="150dip"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dip"
+                android:text="@*android:string/next_button_label"
+                />
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/modules/CMActions/res/layout/switch_bar.xml b/modules/CMActions/res/layout/switch_bar.xml
new file mode 100644
index 0000000..f4b8beb
--- /dev/null
+++ b/modules/CMActions/res/layout/switch_bar.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2014, The Android Open Source 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.
+*/
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <TextView android:id="@+id/switch_text"
+              android:layout_height="wrap_content"
+              android:layout_width="0dp"
+              android:layout_weight="1"
+              android:layout_gravity="center_vertical"
+              android:maxLines="2"
+              android:ellipsize="end"
+              android:textAppearance="@style/TextAppearance.Switch"
+              android:textColor="?android:attr/textColorPrimary"
+              android:textAlignment="viewStart" />
+
+    <ImageView android:id="@+id/restricted_icon"
+            android:layout_width="@dimen/restricted_icon_size"
+            android:layout_height="@dimen/restricted_icon_size"
+            android:src="@drawable/ic_info"
+            android:theme="@android:style/Theme.Material"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="@dimen/restricted_icon_margin_end"
+            android:visibility="gone" />
+
+    <com.cyanogenmod.cmactions.widget.ToggleSwitch android:id="@+id/switch_widget"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="@null"
+            android:theme="@style/ThemeOverlay.SwitchBar.Settings" />
+
+</merge>
diff --git a/modules/CMActions/res/values/attrs.xml b/modules/CMActions/res/values/attrs.xml
new file mode 100644
index 0000000..d258ae7
--- /dev/null
+++ b/modules/CMActions/res/values/attrs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+     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.
+-->
+
+<resources>
+    <attr name="switchBarTheme" format="reference" />
+    <attr name="switchBarMarginStart" format="dimension" />
+    <attr name="switchBarMarginEnd" format="dimension" />
+    <attr name="switchBarBackgroundColor" format="color" />
+</resources>
diff --git a/modules/CMActions/res/values/colors.xml b/modules/CMActions/res/values/colors.xml
new file mode 100644
index 0000000..9eb4f11
--- /dev/null
+++ b/modules/CMActions/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="secondary_device_default_settings">#ff37474f</color>
+</resources>
diff --git a/modules/CMActions/res/values/dimens.xml b/modules/CMActions/res/values/dimens.xml
new file mode 100644
index 0000000..42bfaae
--- /dev/null
+++ b/modules/CMActions/res/values/dimens.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+     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.
+-->
+<resources>
+    <!-- Restricted icon in switch bar -->
+    <dimen name="restricted_icon_margin_end">16dp</dimen>
+
+    <!-- SwitchBar sub settings margin start / end -->
+    <dimen name="switchbar_subsettings_margin_start">72dp</dimen>
+    <dimen name="switchbar_subsettings_margin_end">16dp</dimen>
+</resources>
diff --git a/modules/CMActions/res/values/strings.xml b/modules/CMActions/res/values/strings.xml
new file mode 100644
index 0000000..0e5b8a5
--- /dev/null
+++ b/modules/CMActions/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+     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.
+-->
+<resources>
+    <!-- Switch On/Off  -->
+    <string name="switch_on_text">@string/switch_bar_on</string>
+    <string name="switch_off_text">@string/switch_bar_off</string>
+</resources>
diff --git a/modules/CMActions/res/values/styles.xml b/modules/CMActions/res/values/styles.xml
new file mode 100644
index 0000000..88fab8f
--- /dev/null
+++ b/modules/CMActions/res/values/styles.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+     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.
+-->
+<resources>
+    <style name="CMActions" parent="@style/PreferenceThemeOverlay.v14.Material">
+        <item name="preferenceTheme">@android:style/Theme.Material.Settings</item>
+        <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
+        <item name="android:colorSecondary">@color/secondary_device_default_settings</item>
+    </style>
+
+    <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent">
+        <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
+        <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
+        <item name="switchBarBackgroundColor">?android:attr/colorSecondary</item>
+    </style>
+
+    <style name="TextAppearance.Switch" parent="@android:style/TextAppearance.Material.Title" />
+
+    <style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small" />
+
+    <style name="TextAppearance.Small.SwitchBar">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textStyle">normal</item>
+    </style>
+</resources>
diff --git a/modules/doze/res/xml/gesture_panel.xml b/modules/CMActions/res/xml/gesture_panel.xml
similarity index 60%
rename from modules/doze/res/xml/gesture_panel.xml
rename to modules/CMActions/res/xml/gesture_panel.xml
index cd5aecd..0655d32 100644
--- a/modules/doze/res/xml/gesture_panel.xml
+++ b/modules/CMActions/res/xml/gesture_panel.xml
@@ -13,28 +13,26 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory
-        android:key="ambient_display_key"
-        android:title="@string/ambient_display_title">
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="gesture_pocket"
+        android:summary="@string/pocket_gesture_summary"
+        android:title="@string/pocket_gesture_title" />
 
-        <SwitchPreference
-            android:key="ambient_display_enable"
-            android:defaultValue="true"
-            android:title="@string/ambient_display_enable_title"
-            android:summary="@string/ambient_display_enable_summary" />
+    <PreferenceCategory
+        android:title="@string/hand_wave_gesture_title">
 
         <SwitchPreference
-            android:key="gesture_hand_wave"
             android:defaultValue="false"
-            android:title="@string/hand_wave_gesture_title"
-            android:summary="@string/hand_wave_gesture_summary" />
+            android:key="gesture_hand_wave"
+            android:summary="@string/hand_wave_gesture_summary"
+            android:title="@string/hand_wave_gesture_title" />
 
         <SwitchPreference
-            android:key="gesture_pocket"
             android:defaultValue="false"
-            android:title="@string/pocket_gesture_title"
-            android:summary="@string/pocket_gesture_summary" />
-
+            android:key="gesture_hand_wave_flat"
+            android:summary="@string/hand_wave_gesture_flat_summary"
+            android:title="@string/hand_wave_gesture_flat_title" />
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/modules/CMActions/src/com/cyanogenmod/cmactions/CMActionsReceiver.java b/modules/CMActions/src/com/cyanogenmod/cmactions/CMActionsReceiver.java
new file mode 100644
index 0000000..f865607
--- /dev/null
+++ b/modules/CMActions/src/com/cyanogenmod/cmactions/CMActionsReceiver.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ * 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.cmactions;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.provider.Settings;
+
+import cyanogenmod.preference.RemotePreferenceUpdater;
+
+public class CMActionsReceiver extends RemotePreferenceUpdater {
+
+    @Override
+    public void onReceive(final Context context, Intent intent) {
+        super.onReceive(context, intent);
+        if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
+            if (areGesturesEnabled(context)) {
+                context.startServiceAsUser(new Intent(context, CMActionsService.class),
+                        UserHandle.CURRENT);
+            }
+        }
+    }
+
+    private boolean areGesturesEnabled(Context context) {
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        return sharedPrefs.getBoolean(Constants.PREF_GESTURE_HAND_WAVE_KEY, false) ||
+                sharedPrefs.getBoolean(Constants.PREF_GESTURE_POCKET_KEY, false);
+    }
+
+    @Override
+    public String getSummary(Context context, String key) {
+        if (Constants.DOZE_SETTINGS_TILE_KEY.equals(key)) {
+            if (isDozeEnabled(context)) {
+                return context.getString(R.string.ambient_display_summary_on);
+            } else {
+                return context.getString(R.string.ambient_display_summary_off);
+            }
+        }
+        return null;
+    }
+
+    private boolean isDozeEnabled(Context context) {
+        return Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.DOZE_ENABLED, 1) != 0;
+    }
+
+    public static void notifyChanged(Context context) {
+        notifyChanged(context, Constants.DOZE_SETTINGS_TILE_KEY);
+    }
+}
diff --git a/modules/CMActions/src/com/cyanogenmod/cmactions/CMActionsService.java b/modules/CMActions/src/com/cyanogenmod/cmactions/CMActionsService.java
new file mode 100644
index 0000000..17e1b5c
--- /dev/null
+++ b/modules/CMActions/src/com/cyanogenmod/cmactions/CMActionsService.java
@@ -0,0 +1,333 @@
+/*
+ * 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.
+ * 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.cmactions;
+
+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.database.ContentObserver;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.os.UserHandle;
+import android.preference.PreferenceManager;
+import android.provider.Settings;
+import android.util.Log;
+
+public class CMActionsService extends Service {
+    private static final String TAG = "CMActionsService";
+    private static final boolean DEBUG = false;
+
+    private static final int POCKET_DELTA_NS = 1000 * 1000 * 1000;
+
+    private static final int INCLINATION_THS = 20;
+
+    private Context mContext;
+    private MotoProximitySensor mSensor;
+    private PowerManager mPowerManager;
+    private PowerManager.WakeLock mWakeLock;
+
+    private boolean mHandwaveGestureEnabled = false;
+    private boolean mPocketGestureEnabled = false;
+    private boolean mHandwaveGestureFlatEnabled = false;
+
+    private boolean mScreenStateReceiverAdded = false;
+
+    private final ContentObserver mDozeContentObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            if (isDozeEnabled()) {
+                addScreenStateReceiver();
+            } else {
+                removeScreenStateReceiver();
+            }
+        }
+    };
+
+    class MotoProximitySensor implements SensorEventListener {
+        private SensorManager mSensorManager;
+        private Sensor mProxSensor;
+        private Sensor mAccelSensor;
+        private boolean mProxEnabled = false;
+        private boolean mAccelEnabled = false;
+
+        private boolean mSawNear = false;
+        private long mInPocketTime = 0;
+        private boolean mPulseIfFlat = false;
+
+        public MotoProximitySensor(Context context) {
+            mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+            mProxSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
+            mAccelSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+        }
+
+        @Override
+        public void onSensorChanged(SensorEvent event) {
+            int sensorType = event.sensor.getType();
+            switch (sensorType) {
+                case Sensor.TYPE_PROXIMITY:
+                    checkProxEvent(event);
+                    break;
+                case Sensor.TYPE_ACCELEROMETER:
+                    checkAccelEvent(event);
+                    break;
+            }
+        }
+
+        private void checkProxEvent(SensorEvent event) {
+            boolean isNear = event.values[0] < mProxSensor.getMaximumRange();
+            if (mSawNear && !isNear) {
+                if (isHandWaveGesture(event.timestamp)) {
+                    if (!mHandwaveGestureFlatEnabled) {
+                        launchDozePulse();
+                    } else {
+                        mPulseIfFlat = true;
+                        setAccelEnabled(true);
+                    }
+                } else if (isPocketGesture(event.timestamp)) {
+                    launchDozePulse();
+                }
+            } else {
+                mInPocketTime = event.timestamp;
+            }
+            mSawNear = isNear;
+        }
+
+        private void checkAccelEvent(SensorEvent event) {
+            if (mPulseIfFlat) {
+                mPulseIfFlat = false;
+
+                // Taken from http://stackoverflow.com/a/15149421
+                float x = event.values[0];
+                float y = event.values[1];
+                float z = event.values[2];
+                float norm = (float) Math.sqrt(x * x + y * y + z * z);
+                z /= norm;
+                int inclination = (int) Math.round(Math.toDegrees(Math.acos(z)));
+
+                if (DEBUG) Log.d(TAG, "Inclination=" + inclination);
+
+                if (inclination < INCLINATION_THS) {
+                    launchDozePulse();
+                }
+            }
+            setAccelEnabled(false);
+        }
+
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
+            /* Empty */
+        }
+
+        private boolean isHandWaveGesture(long timestamp) {
+            long delta = timestamp - mInPocketTime;
+            return mHandwaveGestureEnabled && delta < POCKET_DELTA_NS;
+        }
+
+        private boolean isPocketGesture(long timestamp) {
+            long delta = timestamp - mInPocketTime;
+            return mPocketGestureEnabled && delta >= POCKET_DELTA_NS;
+        }
+
+        private void setProxEnabled(boolean enable) {
+            if (mProxEnabled == enable) {
+                return;
+            }
+            mProxEnabled = enable;
+            if (enable) {
+                mSensorManager.registerListener(this, mProxSensor,
+                        SensorManager.SENSOR_DELAY_NORMAL);
+            } else {
+                mSensorManager.unregisterListener(this, mProxSensor);
+            }
+        }
+
+        public void setAccelEnabled(boolean enable) {
+            if (mAccelEnabled == enable) {
+                return;
+            }
+            mAccelEnabled = enable;
+            if (enable) {
+                mSensorManager.registerListener(this, mAccelSensor,
+                        SensorManager.SENSOR_DELAY_FASTEST);
+            } else {
+                mSensorManager.unregisterListener(this, mAccelSensor);
+            }
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        if (DEBUG) Log.d(TAG, "CMActionsService Started");
+        mContext = this;
+        mPowerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        mSensor = new MotoProximitySensor(mContext);
+        mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "CMActionsWakeLock");
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+        mHandwaveGestureEnabled =
+                sharedPrefs.getBoolean(Constants.PREF_GESTURE_HAND_WAVE_KEY, false);
+        mHandwaveGestureFlatEnabled =
+                sharedPrefs.getBoolean(Constants.PREF_GESTURE_HAND_WAVE_FLAT_KEY, false);
+        mPocketGestureEnabled = sharedPrefs.getBoolean(Constants.PREF_GESTURE_POCKET_KEY, false);
+        sharedPrefs.registerOnSharedPreferenceChangeListener(mPrefListener);
+
+        getContentResolver().registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.DOZE_ENABLED),
+                false, mDozeContentObserver);
+
+        if (!isInteractive() && areGesturesEnabled() && isDozeEnabled()) {
+            mSensor.setProxEnabled(true);
+        }
+
+        if (areGesturesEnabled()) {
+            addScreenStateReceiver();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        if (DEBUG) Log.d(TAG, "CMActionsService Stopped");
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+        sharedPrefs.unregisterOnSharedPreferenceChangeListener(mPrefListener);
+        getContentResolver().unregisterContentObserver(mDozeContentObserver);
+        removeScreenStateReceiver();
+        mSensor.setProxEnabled(false);
+        mSensor.setAccelEnabled(false);
+        holdWakelock(false);
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (DEBUG) Log.d(TAG, "Starting service");
+        return START_STICKY;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    private boolean isDozeEnabled() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.DOZE_ENABLED, 1) != 0;
+    }
+
+    private void addScreenStateReceiver() {
+        if (!mScreenStateReceiverAdded) {
+            if (DEBUG) Log.d(TAG, "Adding screen state receiver");
+            IntentFilter screenStateFilter = new IntentFilter(Intent.ACTION_SCREEN_ON);
+            screenStateFilter.addAction(Intent.ACTION_SCREEN_OFF);
+            mContext.registerReceiver(mScreenStateReceiver, screenStateFilter);
+            mScreenStateReceiverAdded = true;
+        }
+    }
+
+    private void removeScreenStateReceiver() {
+        if (mScreenStateReceiverAdded) {
+            if (DEBUG) Log.d(TAG, "Removing screen state receiver");
+            mContext.unregisterReceiver(mScreenStateReceiver);
+            mScreenStateReceiverAdded = false;
+        }
+    }
+
+    private void launchDozePulse() {
+        mContext.sendBroadcastAsUser(new Intent(Constants.DOZE_INTENT), UserHandle.CURRENT);
+    }
+
+    private boolean isInteractive() {
+        return mPowerManager.isInteractive();
+    }
+
+    private boolean areGesturesEnabled() {
+        return mHandwaveGestureEnabled || mPocketGestureEnabled;
+    }
+
+    private void holdWakelock(boolean hold) {
+        if (DEBUG) Log.d(TAG, "hold=" + hold + ", held=" + mWakeLock.isHeld());
+        if (hold == mWakeLock.isHeld()) {
+            return;
+        }
+        if (hold) {
+            mWakeLock.acquire();
+        } else {
+            mWakeLock.release();
+        }
+    }
+
+    private void onDisplayOn() {
+        if (DEBUG) Log.d(TAG, "Display on");
+        mSensor.setProxEnabled(false);
+        if (areGesturesEnabled() && isDozeEnabled()) {
+            holdWakelock(true);
+        }
+    }
+
+    private void onDisplayOff() {
+        if (DEBUG) Log.d(TAG, "Display off");
+        if (areGesturesEnabled() && isDozeEnabled()) {
+            mSensor.setProxEnabled(true);
+        }
+        holdWakelock(false);
+    }
+
+    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 (Constants.PREF_GESTURE_HAND_WAVE_KEY.equals(key)) {
+                        mHandwaveGestureEnabled = sharedPreferences.getBoolean(
+                                Constants.PREF_GESTURE_HAND_WAVE_KEY, false);
+                    } else if (Constants.PREF_GESTURE_POCKET_KEY.equals(key)) {
+                        mPocketGestureEnabled = sharedPreferences
+                                .getBoolean(Constants.PREF_GESTURE_POCKET_KEY, false);
+                    } else if (Constants.PREF_GESTURE_HAND_WAVE_FLAT_KEY.equals(key)) {
+                        mHandwaveGestureFlatEnabled = sharedPreferences
+                                .getBoolean(Constants.PREF_GESTURE_HAND_WAVE_FLAT_KEY, false);
+                    }
+
+                    if (areGesturesEnabled()) {
+                        addScreenStateReceiver();
+                        holdWakelock(true);
+                    } else {
+                        removeScreenStateReceiver();
+                        holdWakelock(false);
+                    }
+                }
+            };
+}
diff --git a/modules/CMActions/src/com/cyanogenmod/cmactions/Constants.java b/modules/CMActions/src/com/cyanogenmod/cmactions/Constants.java
new file mode 100644
index 0000000..9f60131
--- /dev/null
+++ b/modules/CMActions/src/com/cyanogenmod/cmactions/Constants.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ * 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.cmactions;
+
+public class Constants {
+
+    public static final String DOZE_INTENT = "com.android.systemui.doze.pulse";
+
+    public static final String PREF_GESTURE_HAND_WAVE_KEY = "gesture_hand_wave";
+    public static final String PREF_GESTURE_HAND_WAVE_FLAT_KEY = "gesture_hand_wave_flat";
+    public static final String PREF_GESTURE_POCKET_KEY = "gesture_pocket";
+
+    public static final String DOZE_SETTINGS_TILE_KEY = "doze_device_settings";
+}
diff --git a/modules/CMActions/src/com/cyanogenmod/cmactions/GesturePreferenceActivity.java b/modules/CMActions/src/com/cyanogenmod/cmactions/GesturePreferenceActivity.java
new file mode 100644
index 0000000..8c8cef4
--- /dev/null
+++ b/modules/CMActions/src/com/cyanogenmod/cmactions/GesturePreferenceActivity.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ * 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.cmactions;
+
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import com.android.settingslib.drawer.SettingsDrawerActivity;
+
+import com.cyanogenmod.cmactions.widget.SwitchBar;
+
+public class GesturePreferenceActivity extends SettingsDrawerActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.settings_main_prefs);
+        getActionBar().setDisplayHomeAsUpEnabled(true);
+        getFragmentManager().beginTransaction()
+                .replace(R.id.main_content, new GesturePreferenceFragment()).commit();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    public SwitchBar getSwitchBar() {
+        return (SwitchBar) findViewById(R.id.switch_bar);
+    }
+}
diff --git a/modules/CMActions/src/com/cyanogenmod/cmactions/GesturePreferenceFragment.java b/modules/CMActions/src/com/cyanogenmod/cmactions/GesturePreferenceFragment.java
new file mode 100644
index 0000000..5d70642
--- /dev/null
+++ b/modules/CMActions/src/com/cyanogenmod/cmactions/GesturePreferenceFragment.java
@@ -0,0 +1,109 @@
+/*
+ * 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.
+ * 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.cmactions;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.provider.Settings;
+import android.widget.Switch;
+
+import com.cyanogenmod.cmactions.widget.SwitchBar;
+
+public class GesturePreferenceFragment extends PreferenceFragment implements
+        Preference.OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener {
+
+    private SwitchBar mSwitchBar;
+    private SwitchPreference mPocketPreference;
+    private SwitchPreference mHandwavePreference;
+    private SwitchPreference mHandwaveFlatPreference;
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        boolean isDozeEnabled = isDozeEnabled();
+        mSwitchBar = ((GesturePreferenceActivity) getActivity()).getSwitchBar();
+        mSwitchBar.setChecked(isDozeEnabled);
+        mSwitchBar.show();
+        mSwitchBar.addOnSwitchChangeListener(this);
+        getPreferenceScreen().setEnabled(isDozeEnabled);
+    }
+
+    @Override
+    public void onDestroyView() {
+        mSwitchBar.removeOnSwitchChangeListener(this);
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        addPreferencesFromResource(R.xml.gesture_panel);
+        mPocketPreference = (SwitchPreference) findPreference(Constants.PREF_GESTURE_POCKET_KEY);
+        mPocketPreference.setOnPreferenceChangeListener(this);
+        mHandwavePreference =
+                (SwitchPreference) findPreference(Constants.PREF_GESTURE_HAND_WAVE_KEY);
+        mHandwavePreference.setOnPreferenceChangeListener(this);
+        mHandwaveFlatPreference =
+                (SwitchPreference) findPreference(Constants.PREF_GESTURE_HAND_WAVE_FLAT_KEY);
+        mHandwaveFlatPreference.setEnabled(mHandwavePreference.isChecked());
+    }
+
+    private boolean enableDoze(boolean enable) {
+        boolean result = Settings.Secure.putInt(getActivity().getContentResolver(),
+                Settings.Secure.DOZE_ENABLED, enable ? 1 : 0);
+        CMActionsReceiver.notifyChanged(getActivity());
+        return result;
+    }
+
+    private boolean isDozeEnabled() {
+        return Settings.Secure.getInt(getActivity().getContentResolver(),
+                Settings.Secure.DOZE_ENABLED, 1) != 0;
+    }
+
+    private void serviceEnabled(boolean enable) {
+        Intent intent = new Intent(getContext(), CMActionsService.class);
+        if (enable) {
+            getContext().startServiceAsUser(intent, UserHandle.CURRENT);
+        } else {
+            getContext().stopServiceAsUser(intent, UserHandle.CURRENT);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        boolean enable = (boolean) newValue;
+        if (preference.equals(mPocketPreference)) {
+            serviceEnabled(enable || mHandwavePreference.isChecked());
+            return true;
+        } else if (preference.equals(mHandwavePreference)) {
+            serviceEnabled(enable || mPocketPreference.isChecked());
+            mHandwaveFlatPreference.setEnabled(enable);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        enableDoze(isChecked);
+        getPreferenceScreen().setEnabled(isChecked);
+    }
+}
diff --git a/modules/CMActions/src/com/cyanogenmod/cmactions/widget/SwitchBar.java b/modules/CMActions/src/com/cyanogenmod/cmactions/widget/SwitchBar.java
new file mode 100644
index 0000000..ea60846
--- /dev/null
+++ b/modules/CMActions/src/com/cyanogenmod/cmactions/widget/SwitchBar.java
@@ -0,0 +1,371 @@
+/*
+ * Copyright (C) 2014 The Android Open Source 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.cmactions.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.style.TextAppearanceSpan;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.CompoundButton;
+import android.widget.LinearLayout;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import com.android.internal.logging.MetricsLogger;
+import com.cyanogenmod.cmactions.R;
+import com.android.settingslib.RestrictedLockUtils;
+
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import java.util.ArrayList;
+
+public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener,
+        View.OnClickListener {
+
+    public interface OnSwitchChangeListener {
+        /**
+         * Called when the checked state of the Switch has changed.
+         *
+         * @param switchView The Switch view whose state has changed.
+         * @param isChecked  The new checked state of switchView.
+         */
+        void onSwitchChanged(Switch switchView, boolean isChecked);
+    }
+
+    private final TextAppearanceSpan mSummarySpan;
+
+    private ToggleSwitch mSwitch;
+    private View mRestrictedIcon;
+    private TextView mTextView;
+    private String mLabel;
+    private String mSummary;
+
+    private boolean mLoggingIntialized;
+    private boolean mDisabledByAdmin;
+    private EnforcedAdmin mEnforcedAdmin = null;
+
+    private String mMetricsTag;
+
+    private ArrayList<OnSwitchChangeListener> mSwitchChangeListeners =
+            new ArrayList<OnSwitchChangeListener>();
+
+    private static int[] XML_ATTRIBUTES = {
+            R.attr.switchBarMarginStart, R.attr.switchBarMarginEnd,
+            R.attr.switchBarBackgroundColor};
+
+    public SwitchBar(Context context) {
+        this(context, null);
+    }
+
+    public SwitchBar(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SwitchBar(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public SwitchBar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+
+        LayoutInflater.from(context).inflate(R.layout.switch_bar, this);
+
+        final TypedArray a = context.obtainStyledAttributes(attrs, XML_ATTRIBUTES);
+        int switchBarMarginStart = (int) a.getDimension(0, 0);
+        int switchBarMarginEnd = (int) a.getDimension(1, 0);
+        int switchBarBackgroundColor = (int) a.getColor(2, 0);
+        a.recycle();
+
+        mTextView = (TextView) findViewById(R.id.switch_text);
+        mTextView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
+        mLabel = getResources().getString(R.string.switch_off_text);
+        mSummarySpan = new TextAppearanceSpan(mContext, R.style.TextAppearance_Small_SwitchBar);
+        updateText();
+        ViewGroup.MarginLayoutParams lp = (MarginLayoutParams) mTextView.getLayoutParams();
+        lp.setMarginStart(switchBarMarginStart);
+
+        mSwitch = (ToggleSwitch) findViewById(R.id.switch_widget);
+        // Prevent onSaveInstanceState() to be called as we are managing the state of the Switch
+        // on our own
+        mSwitch.setSaveEnabled(false);
+        mSwitch.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
+        lp = (MarginLayoutParams) mSwitch.getLayoutParams();
+        lp.setMarginEnd(switchBarMarginEnd);
+        setBackgroundColor(switchBarBackgroundColor);
+        mSwitch.setBackgroundColor(switchBarBackgroundColor);
+
+        addOnSwitchChangeListener(new OnSwitchChangeListener() {
+            @Override
+            public void onSwitchChanged(Switch switchView, boolean isChecked) {
+                setTextViewLabel(isChecked);
+            }
+        });
+
+        mRestrictedIcon = findViewById(R.id.restricted_icon);
+
+        setOnClickListener(this);
+
+        // Default is hide
+        setVisibility(View.GONE);
+    }
+
+    public void setMetricsTag(String tag) {
+        mMetricsTag = tag;
+    }
+
+    public void setTextViewLabel(boolean isChecked) {
+        mLabel = getResources()
+                .getString(isChecked ? R.string.switch_on_text : R.string.switch_off_text);
+        updateText();
+    }
+
+    public void setSummary(String summary) {
+        mSummary = summary;
+        updateText();
+    }
+
+    private void updateText() {
+        if (TextUtils.isEmpty(mSummary)) {
+            mTextView.setText(mLabel);
+            return;
+        }
+        final SpannableStringBuilder ssb = new SpannableStringBuilder(mLabel).append('\n');
+        final int start = ssb.length();
+        ssb.append(mSummary);
+        ssb.setSpan(mSummarySpan, start, ssb.length(), 0);
+        mTextView.setText(ssb);
+    }
+
+    public void setChecked(boolean checked) {
+        setTextViewLabel(checked);
+        mSwitch.setChecked(checked);
+    }
+
+    public void setCheckedInternal(boolean checked) {
+        setTextViewLabel(checked);
+        mSwitch.setCheckedInternal(checked);
+    }
+
+    public boolean isChecked() {
+        return mSwitch.isChecked();
+    }
+
+    public void setEnabled(boolean enabled) {
+        if (enabled && mDisabledByAdmin) {
+            setDisabledByAdmin(null);
+            return;
+        }
+        super.setEnabled(enabled);
+        mTextView.setEnabled(enabled);
+        mSwitch.setEnabled(enabled);
+    }
+
+    /**
+     * If admin is not null, disables the text and switch but keeps the view clickable.
+     * Otherwise, calls setEnabled which will enables the entire view including
+     * the text and switch.
+     */
+    public void setDisabledByAdmin(EnforcedAdmin admin) {
+        mEnforcedAdmin = admin;
+        if (admin != null) {
+            super.setEnabled(true);
+            mDisabledByAdmin = true;
+            mTextView.setEnabled(false);
+            mSwitch.setEnabled(false);
+            mSwitch.setVisibility(View.GONE);
+            mRestrictedIcon.setVisibility(View.VISIBLE);
+        } else {
+            mDisabledByAdmin = false;
+            mSwitch.setVisibility(View.VISIBLE);
+            mRestrictedIcon.setVisibility(View.GONE);
+            setEnabled(true);
+        }
+    }
+
+    public final ToggleSwitch getSwitch() {
+        return mSwitch;
+    }
+
+    public void show() {
+        if (!isShowing()) {
+            setVisibility(View.VISIBLE);
+            mSwitch.setOnCheckedChangeListener(this);
+        }
+    }
+
+    public void hide() {
+        if (isShowing()) {
+            setVisibility(View.GONE);
+            mSwitch.setOnCheckedChangeListener(null);
+        }
+    }
+
+    public boolean isShowing() {
+        return (getVisibility() == View.VISIBLE);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (mDisabledByAdmin) {
+            MetricsLogger.count(mContext, mMetricsTag + "/switch_bar|restricted", 1);
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, mEnforcedAdmin);
+        } else {
+            final boolean isChecked = !mSwitch.isChecked();
+            setChecked(isChecked);
+        }
+    }
+
+    public void propagateChecked(boolean isChecked) {
+        final int count = mSwitchChangeListeners.size();
+        for (int n = 0; n < count; n++) {
+            mSwitchChangeListeners.get(n).onSwitchChanged(mSwitch, isChecked);
+        }
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        if (mLoggingIntialized) {
+            MetricsLogger.count(mContext, mMetricsTag + "/switch_bar|" + isChecked, 1);
+        }
+        mLoggingIntialized = true;
+        propagateChecked(isChecked);
+    }
+
+    public void addOnSwitchChangeListener(OnSwitchChangeListener listener) {
+        if (mSwitchChangeListeners.contains(listener)) {
+            throw new IllegalStateException("Cannot add twice the same OnSwitchChangeListener");
+        }
+        mSwitchChangeListeners.add(listener);
+    }
+
+    public void removeOnSwitchChangeListener(OnSwitchChangeListener listener) {
+        if (!mSwitchChangeListeners.contains(listener)) {
+            throw new IllegalStateException("Cannot remove OnSwitchChangeListener");
+        }
+        mSwitchChangeListeners.remove(listener);
+    }
+
+    static class SavedState extends BaseSavedState {
+        boolean checked;
+        boolean visible;
+
+        SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        /**
+         * Constructor called from {@link #CREATOR}
+         */
+        private SavedState(Parcel in) {
+            super(in);
+            checked = (Boolean)in.readValue(null);
+            visible = (Boolean)in.readValue(null);
+        }
+
+        @Override
+        public void writeToParcel(Parcel out, int flags) {
+            super.writeToParcel(out, flags);
+            out.writeValue(checked);
+            out.writeValue(visible);
+        }
+
+        @Override
+        public String toString() {
+            return "SwitchBar.SavedState{"
+                    + Integer.toHexString(System.identityHashCode(this))
+                    + " checked=" + checked
+                    + " visible=" + visible + "}";
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR
+                = new Parcelable.Creator<SavedState>() {
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+
+    @Override
+    public Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+
+        SavedState ss = new SavedState(superState);
+        ss.checked = mSwitch.isChecked();
+        ss.visible = isShowing();
+        return ss;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Parcelable state) {
+        SavedState ss = (SavedState) state;
+
+        super.onRestoreInstanceState(ss.getSuperState());
+
+        mSwitch.setCheckedInternal(ss.checked);
+        setTextViewLabel(ss.checked);
+        setVisibility(ss.visible ? View.VISIBLE : View.GONE);
+        mSwitch.setOnCheckedChangeListener(ss.visible ? this : null);
+
+        requestLayout();
+    }
+
+    @Override
+    public CharSequence getAccessibilityClassName() {
+        return Switch.class.getName();
+    }
+
+    @Override
+    public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {
+        // Since the children are marked as not important for accessibility, re-dispatch all
+        // of their events as if they came from this view
+        event.setSource(this);
+        return true;
+    }
+
+    /** @hide */
+    @Override
+    public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
+        super.onInitializeAccessibilityNodeInfoInternal(info);
+        info.setText(mTextView.getText());
+        info.setCheckable(true);
+        info.setChecked(mSwitch.isChecked());
+    }
+
+    /** @hide */
+    @Override
+    public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
+        super.onInitializeAccessibilityEventInternal(event);
+        // Don't say "on on" or "off off" - rather, speak the state only once. We need to specify
+        // this explicitly as each of our children (the textview and the checkbox) contribute to
+        // the state once, giving us duplicate text by default.
+        event.setContentDescription(mTextView.getText());
+        event.setChecked(mSwitch.isChecked());
+    }
+}
diff --git a/modules/CMActions/src/com/cyanogenmod/cmactions/widget/ToggleSwitch.java b/modules/CMActions/src/com/cyanogenmod/cmactions/widget/ToggleSwitch.java
new file mode 100644
index 0000000..b8ca78a
--- /dev/null
+++ b/modules/CMActions/src/com/cyanogenmod/cmactions/widget/ToggleSwitch.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2013 The Android Open Source 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.cmactions.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.Switch;
+
+public class ToggleSwitch extends Switch {
+
+    private ToggleSwitch.OnBeforeCheckedChangeListener mOnBeforeListener;
+
+    public static interface OnBeforeCheckedChangeListener {
+        public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
+    }
+
+    public ToggleSwitch(Context context) {
+        super(context);
+    }
+
+    public ToggleSwitch(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ToggleSwitch(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public ToggleSwitch(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public void setOnBeforeCheckedChangeListener(OnBeforeCheckedChangeListener listener) {
+        mOnBeforeListener = listener;
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        if (mOnBeforeListener != null
+                && mOnBeforeListener.onBeforeCheckedChanged(this, checked)) {
+            return;
+        }
+        super.setChecked(checked);
+    }
+
+    public void setCheckedInternal(boolean checked) {
+        super.setChecked(checked);
+    }
+}
diff --git a/modules/doze/Android.mk b/modules/doze/Android.mk
deleted file mode 100644
index 8d45eb7..0000000
--- a/modules/doze/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MotoDoze
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    org.cyanogenmod.platform.internal
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/res \
-    $(LOCAL_PATH)/../../../../../packages/resources/devicesettings/res
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/modules/doze/AndroidManifest.xml b/modules/doze/AndroidManifest.xml
deleted file mode 100644
index ec36813..0000000
--- a/modules/doze/AndroidManifest.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cyanogenmod.settings.device"
-    android:versionCode="1"
-    android:versionName="1.0"
-    android:sharedUserId="android.uid.system">
-
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="21"/>
-
-    <application
-        android:label="@string/device_settings_app_name"
-        android:persistent="true">
-
-        <receiver android:name="com.cyanogenmod.settings.device.BootCompletedReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-
-        <service android:name="com.cyanogenmod.settings.device.MotoDozeService"
-                 android:permission="MotoDozeService">
-        </service>
-
-        <activity
-            android:name=".TouchscreenGestureSettings"
-            android:label="@string/screen_gestures_panel_title"
-            android:theme="@android:style/Theme.Material.Settings">
-            <intent-filter>
-                <action android:name="com.android.settings.action.EXTRA_SETTINGS" />
-            </intent-filter>
-            <meta-data
-                android:name="com.android.settings.category"
-                android:value="com.android.settings.category.device" />
-            <meta-data
-                android:name="com.android.settings.icon"
-                android:resource="@drawable/ic_settings_gestures" />
-        </activity>
-
-    </application>
-</manifest>
diff --git a/modules/doze/proguard.flags b/modules/doze/proguard.flags
deleted file mode 100644
index 3bb1f2c..0000000
--- a/modules/doze/proguard.flags
+++ /dev/null
@@ -1,3 +0,0 @@
--keep class com.cyanogenmod.settings.device.* {
-  *;
-}
diff --git a/modules/doze/res/drawable/ic_settings_gestures.xml b/modules/doze/res/drawable/ic_settings_gestures.xml
deleted file mode 100644
index 95cdede..0000000
--- a/modules/doze/res/drawable/ic_settings_gestures.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M4.7,6.9c0.7-0.7,1.4-1.4,1.7-1.2c0.5,0.2,0,1-0.3,1.5c-0.2,0.4-2.8,3.9-2.8,6.3c0,1.3,0.5,2.3,1.3,3
-c0.7,0.6,1.7,0.7,2.6,0.5c1.1-0.3,1.9-1.4,3-2.8c1.2-1.5,2.8-3.4,4-3.4c1.6,0,1.6,1,1.7,1.8c-3.7,0.6-5.3,3.7-5.3,5.4
-s1.4,3.1,3.2,3.1c1.6,0,4.3-1.3,4.6-6.1H21v-2.5h-2.4c-0.1-1.7-1.1-4.2-4-4.2c-2.2,0-4.1,1.9-4.9,2.8c-0.6,0.7-2,2.5-2.3,2.7
-c-0.2,0.3-0.7,0.8-1.1,0.8c-0.4,0-0.7-0.8-0.4-1.9c0.3-1.1,1.4-2.9,1.8-3.5C8.5,8,9.1,7.2,9.1,5.9C9.1,3.7,7.4,3,6.6,3
-C5.3,3,4.1,4,3.9,4.3C3.5,4.6,3.2,4.9,3,5.2L4.7,6.9z
-M13.9,18.6c-0.3,0-0.7-0.3-0.7-0.7c0-0.6,0.7-2.2,2.8-2.8
-C15.8,17.8,14.6,18.6,13.9,18.6z" />
-</vector>
diff --git a/modules/doze/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java b/modules/doze/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java
deleted file mode 100644
index b9687f4..0000000
--- a/modules/doze/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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 = "MotoDoze";
-
-    @Override
-    public void onReceive(final Context context, Intent intent) {
-        if (DEBUG) Log.d(TAG, "Starting service");
-        context.startService(new Intent(context, MotoDozeService.class));
-    }
-
-}
diff --git a/modules/doze/src/com/cyanogenmod/settings/device/MotoDozeService.java b/modules/doze/src/com/cyanogenmod/settings/device/MotoDozeService.java
deleted file mode 100644
index bbaf2ac..0000000
--- a/modules/doze/src/com/cyanogenmod/settings/device/MotoDozeService.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * 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 MotoDozeService extends Service {
-    private static final String TAG = "MotoDozeService";
-    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 MotoProximitySensor mSensor;
-    private PowerManager mPowerManager;
-
-    private boolean mHandwaveGestureEnabled = false;
-    private boolean mPocketGestureEnabled = false;
-
-    class MotoProximitySensor implements SensorEventListener {
-        private SensorManager mSensorManager;
-        private Sensor mSensor;
-
-        private boolean mSawNear = false;
-        private long mInPocketTime = 0;
-
-        public MotoProximitySensor(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 || mPocketGestureEnabled) {
-                mSensorManager.registerListener(this, mSensor, SensorManager.SENSOR_DELAY_NORMAL);
-            }
-        }
-
-        public void disable() {
-            mSensorManager.unregisterListener(this, mSensor);
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        if (DEBUG) Log.d(TAG, "MotoDozeService Started");
-        mContext = this;
-        mPowerManager = (PowerManager)getSystemService(Context.POWER_SERVICE);
-        mSensor = new MotoProximitySensor(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, false);
-        mPocketGestureEnabled = sharedPreferences.getBoolean(GESTURE_POCKET_KEY, false);
-    }
-
-    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, false);
-            } else if (GESTURE_POCKET_KEY.equals(key)) {
-                mPocketGestureEnabled = sharedPreferences.getBoolean(GESTURE_POCKET_KEY, false);
-            }
-        }
-    };
-}
diff --git a/modules/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java b/modules/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java
deleted file mode 100644
index a13cc08..0000000
--- a/modules/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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 org.cyanogenmod.internal.util.ScreenType;
-
-import android.app.ActionBar;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.SwitchPreference;
-import android.provider.Settings;
-import android.view.Menu;
-import android.view.MenuItem;
-
-public class TouchscreenGestureSettings extends PreferenceActivity {
-
-    private static final String KEY_AMBIENT_DISPLAY_ENABLE = "ambient_display_enable";
-    private static final String KEY_GESTURE_POCKET = "gesture_pocket";
-    private static final String KEY_GESTURE_HAND_WAVE = "gesture_hand_wave";
-
-    private SwitchPreference mAmbientDisplayPreference;
-    private SwitchPreference mPocketPreference;
-    private SwitchPreference mHandwavePreference;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.gesture_panel);
-        boolean dozeEnabled = isDozeEnabled();
-        mAmbientDisplayPreference =
-            (SwitchPreference) findPreference(KEY_AMBIENT_DISPLAY_ENABLE);
-        // Read from DOZE_ENABLED secure setting
-        mAmbientDisplayPreference.setChecked(dozeEnabled);
-        mAmbientDisplayPreference.setOnPreferenceChangeListener(mAmbientDisplayPrefListener);
-        mPocketPreference =
-            (SwitchPreference) findPreference(KEY_GESTURE_POCKET);
-        mPocketPreference.setEnabled(dozeEnabled);
-        mHandwavePreference =
-            (SwitchPreference) findPreference(KEY_GESTURE_HAND_WAVE);
-        mHandwavePreference.setEnabled(dozeEnabled);
-
-        final ActionBar bar = getActionBar();
-        bar.setDisplayHomeAsUpEnabled(true);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                onBackPressed();
-                return true;
-        }
-        return false;
-    }
-
-    @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);
-        }
-    }
-
-    private boolean enableDoze(boolean enable) {
-        return Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.DOZE_ENABLED, enable ? 1 : 0);
-    }
-
-    private boolean isDozeEnabled() {
-        return Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.DOZE_ENABLED, 1) != 0;
-    }
-
-    private Preference.OnPreferenceChangeListener mAmbientDisplayPrefListener =
-        new Preference.OnPreferenceChangeListener() {
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object newValue) {
-            boolean enable = (boolean) newValue;
-            boolean ret = enableDoze(enable);
-            if (ret) {
-                mPocketPreference.setEnabled(enable);
-                mHandwavePreference.setEnabled(enable);
-            }
-            return ret;
-        }
-    };
-}
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index c76c069..ae7c4e4 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -261,6 +261,10 @@
          Doze dreams will run whenever the power manager is in a dozing state. -->
     <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
+    <!-- If true, the doze component is not started until after the screen has been
+         turned off and the screen off animation has been performed. -->
+    <bool name="config_dozeAfterScreenOff">true</bool>
+
     <!-- Power Management: Specifies whether to decouple the interactive state of the
          device from the display on/off state.