From 95ffdd36da74e91a0ff532ad3cea063233935856 Mon Sep 17 00:00:00 2001
From: Ali B <abittin@gmail.com>
Date: Sun, 28 Oct 2018 16:48:25 +0300
Subject: [PATCH 1/2] msm8996-common: move doze settings into display category

- Make it follow DeviceHandlerTheme
- Remove icon
- Add entry summary

Change-Id: I6c0ef97de70d1992ef67f5c1f262cc6b00dc911d
---
 doze/AndroidManifest.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doze/AndroidManifest.xml b/doze/AndroidManifest.xml
index 62d87f320..5d188d159 100644
--- a/doze/AndroidManifest.xml
+++ b/doze/AndroidManifest.xml
@@ -53,6 +53,11 @@
                 <action android:name="org.lineageos.settings.device.DOZE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data
+                android:name="com.android.settings.category"
+                android:value="com.android.settings.category.ia.display" />
+            <meta-data android:name="com.android.settings.summary"
+                android:resource="@string/ambient_display_summary"/>
         </activity>
 
     </application>

From ead162b8e05198f0dcf9b0ddd599ccd833350561 Mon Sep 17 00:00:00 2001
From: Anirudh Gupta <anirudhgupta109@gmail.com>
Date: Sat, 2 Feb 2019 17:25:05 +0530
Subject: [PATCH 2/2] msm8996-common: doze: res: Add vector icons

The screen looks way too bland without any icons
Vectors taken from https://materialdesignicons.com/ with added tint.

Co-authored-by: arian <arian.kulmer@web.de>
Signed-off-by: Anirudh Gupta <anirudhgupta109@gmail.com>
Change-Id: I9eb0a678c65e12a0d39a1a1e1867c5f9f2f92531
---
 doze/res/drawable/ic_eye.xml    |  9 +++++++++
 doze/res/drawable/ic_pickup.xml |  9 +++++++++
 doze/res/drawable/ic_pocket.xml |  9 +++++++++
 doze/res/xml/doze_settings.xml  | 11 +++++++----
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 doze/res/drawable/ic_eye.xml
 create mode 100644 doze/res/drawable/ic_pickup.xml
 create mode 100644 doze/res/drawable/ic_pocket.xml

diff --git a/doze/res/drawable/ic_eye.xml b/doze/res/drawable/ic_eye.xml
new file mode 100644
index 000000000..c5ce16992
--- /dev/null
+++ b/doze/res/drawable/ic_eye.xml
@@ -0,0 +1,9 @@
+<!-- drawable/eye.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path android:fillColor="#000" android:pathData="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z" />
+</vector>
diff --git a/doze/res/drawable/ic_pickup.xml b/doze/res/drawable/ic_pickup.xml
new file mode 100644
index 000000000..a7d5eb7ae
--- /dev/null
+++ b/doze/res/drawable/ic_pickup.xml
@@ -0,0 +1,9 @@
+<!-- drawable/arrow_decision_outline.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path android:fillColor="#000" android:pathData="M9.64,13.4C8.63,12.5 7.34,12.03 6,12V15L2,11L6,7V10C7.67,10 9.3,10.57 10.63,11.59C10.22,12.15 9.89,12.76 9.64,13.4M18,15V12C17.5,12 13.5,12.16 13.05,16.2C14.61,16.75 15.43,18.47 14.88,20.03C14.33,21.59 12.61,22.41 11.05,21.86C9.5,21.3 8.67,19.59 9.22,18.03C9.5,17.17 10.2,16.5 11.05,16.2C11.34,12.61 14.4,9.88 18,10V7L22,11L18,15M13,19A1,1 0 0,0 12,18A1,1 0 0,0 11,19A1,1 0 0,0 12,20A1,1 0 0,0 13,19M11,11.12C11.58,10.46 12.25,9.89 13,9.43V5H16L12,1L8,5H11V11.12Z" />
+</vector>
diff --git a/doze/res/drawable/ic_pocket.xml b/doze/res/drawable/ic_pocket.xml
new file mode 100644
index 000000000..44ae6e2a8
--- /dev/null
+++ b/doze/res/drawable/ic_pocket.xml
@@ -0,0 +1,9 @@
+<!-- drawable/pocket.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path android:fillColor="#000" android:pathData="M21.9,4.26C21.64,3.55 20.96,3.07 20.2,3.07H20.19L18.46,3.07H3.81C3.07,3.07 2.39,3.54 2.12,4.24C2.04,4.45 2,4.66 2,4.88V10.92L2.07,12.12C2.36,14.85 3.78,17.23 5.97,18.9C6,18.93 6.05,18.96 6.09,19H6.11C7.29,19.86 8.6,20.44 10,20.73C10.68,20.86 11.35,20.93 12,20.93C12.63,20.93 13.25,20.87 13.85,20.76C13.93,20.75 14,20.73 14.07,20.72C14.09,20.71 14.11,20.7 14.14,20.69C15.5,20.4 16.76,19.83 17.89,19H17.91C17.95,18.96 18,18.93 18.03,18.9C20.22,17.23 21.64,14.85 21.93,12.12L22,10.92V4.88C22,4.68 21.97,4.47 21.9,4.26M17.67,10.55L12.96,15.06C12.7,15.32 12.35,15.44 12,15.44C11.67,15.44 11.33,15.32 11.06,15.06L6.36,10.55C5.81,10.03 5.79,9.16 6.32,8.61C6.84,8.06 7.71,8.05 8.26,8.57L12,12.17L15.77,8.57C16.31,8.05 17.18,8.07 17.71,8.61C18.23,9.16 18.21,10.03 17.67,10.55Z" />
+</vector>
diff --git a/doze/res/xml/doze_settings.xml b/doze/res/xml/doze_settings.xml
index e00d61a00..4dba869a1 100644
--- a/doze/res/xml/doze_settings.xml
+++ b/doze/res/xml/doze_settings.xml
@@ -19,10 +19,11 @@
 
     <SwitchPreference
         android:key="always_on_display"
-        android:disableDependentsState="true"
+        android:disableDependentsState="false"
         android:title="@string/ambient_display_always_on_title"
         android:summary="@string/ambient_display_always_on_summary"
-        android:persistent="false" />
+        android:persistent="false"
+        android:icon="@drawable/ic_eye" />
 
     <PreferenceCategory
         android:key="tilt_sensor"
@@ -32,7 +33,8 @@
             android:key="gesture_pick_up"
             android:defaultValue="false"
             android:title="@string/pick_up_gesture_title"
-            android:summary="@string/pick_up_gesture_summary" />
+            android:summary="@string/pick_up_gesture_summary"
+            android:icon="@drawable/ic_pickup" />
 
     </PreferenceCategory>
 
@@ -50,7 +52,8 @@
             android:key="gesture_pocket"
             android:defaultValue="false"
             android:title="@string/pocket_gesture_title"
-            android:summary="@string/pocket_gesture_summary" />
+            android:summary="@string/pocket_gesture_summary"
+            android:icon="@drawable/ic_pocket" />
 
     </PreferenceCategory>