From 49c7d764892da74f7b27faec282cc683d9288a8f Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Wed, 30 Dec 2020 12:14:35 +0530
Subject: [PATCH 1/4] update lineageos sdk , icon on navigation menu

---
 Android.bp                                     |  3 ++-
 proguard.flags                                 |  2 +-
 src/com/android/documentsui/base/RootInfo.java | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Android.bp b/Android.bp
index f3fd86397..5b78c1af3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,6 +26,7 @@ java_defaults {
         "apache-commons-compress",
         "com.google.android.material_material",
         "guava",
+        "org.lineageos.platform.sdk",
     ],
 
     privileged: true,
@@ -36,7 +37,7 @@ java_defaults {
         proguard_flags_files: ["proguard.flags"],
     },
 
-    sdk_version: "system_current",
+    platform_apis: true,
     min_sdk_version: "28",
     target_sdk_version: "28",
 
diff --git a/proguard.flags b/proguard.flags
index 1d253261b..4830618c6 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -19,4 +19,4 @@
 
 # To prevent class not found exception in org.brotli.dec.Dictionary
 -keep final class org.brotli.dec.DictionaryData
-
+-dontwarn lineageos.**
diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java
index dd82077d1..c796a687f 100644
--- a/src/com/android/documentsui/base/RootInfo.java
+++ b/src/com/android/documentsui/base/RootInfo.java
@@ -210,7 +210,7 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> {
 
         if (isExternalStorageHome()) {
             derivedType = TYPE_LOCAL;
-            derivedIcon = LOAD_FROM_CONTENT_RESOLVER;
+            derivedIcon = lineageos.platform.R.drawable.ic_folder;//LOAD_FROM_CONTENT_RESOLVER;
         } else if (isMtp()) {
             derivedType = TYPE_MTP;
             derivedIcon = R.drawable.ic_usb_storage;
@@ -222,19 +222,19 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> {
             derivedIcon = R.drawable.ic_sd_storage;
         } else if (isExternalStorage()) {
             derivedType = TYPE_LOCAL;
-            derivedIcon = R.drawable.ic_root_smartphone;
+            derivedIcon = lineageos.platform.R.drawable.ic_device_phone;//R.drawable.ic_root_smartphone;
         } else if (isDownloads()) {
             derivedType = TYPE_DOWNLOADS;
-            derivedIcon = R.drawable.ic_root_download;
+            derivedIcon = lineageos.platform.R.drawable.ic_downloads;//R.drawable.ic_root_download;
         } else if (isImages()) {
             derivedType = TYPE_IMAGES;
-            derivedIcon = LOAD_FROM_CONTENT_RESOLVER;
+            derivedIcon = lineageos.platform.R.drawable.ic_album;//LOAD_FROM_CONTENT_RESOLVER;
         } else if (isVideos()) {
             derivedType = TYPE_VIDEO;
-            derivedIcon = LOAD_FROM_CONTENT_RESOLVER;
+            derivedIcon = lineageos.platform.R.drawable.ic_videos;///LOAD_FROM_CONTENT_RESOLVER;
         } else if (isAudio()) {
             derivedType = TYPE_AUDIO;
-            derivedIcon = LOAD_FROM_CONTENT_RESOLVER;
+            derivedIcon = lineageos.platform.R.drawable.ic_audio;//LOAD_FROM_CONTENT_RESOLVER;
         } else if (isRecents()) {
             derivedType = TYPE_RECENTS;
         } else {
-- 
GitLab


From 0a4f588df0a9798c54e34a0acc50db7d60a2d66a Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Wed, 30 Dec 2020 19:51:26 +0530
Subject: [PATCH 2/4] update hamburger icon color and color control

---
 res/drawable/ic_hamburger.xml | 2 +-
 res/values/styles.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml
index 70a884f44..2ab5fd9e0 100644
--- a/res/drawable/ic_hamburger.xml
+++ b/res/drawable/ic_hamburger.xml
@@ -19,7 +19,7 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24"
-    android:tint="@color/color_default_primary_text"
+    android:tint="@color/accent"
     >
     <path
         android:fillColor="?android:attr/colorControlNormal"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 032997df9..4c4810e25 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="colorControlNormal">@color/color_default_blue1</item>
+        <item name="colorControlNormal">@color/color_default_primary_text</item>
     </style>
 
     <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
-- 
GitLab


From 74ed1443b9b05bfe5365d912d83f875df005ca15 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Wed, 30 Dec 2020 19:56:29 +0530
Subject: [PATCH 3/4] update color from sdk ui

---
 res/values/colors.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/values/colors.xml b/res/values/colors.xml
index adf888683..fc3ca0061 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -48,13 +48,13 @@
 
 
 
-    <color name="accent">@color/color_default_blue1</color>
+    <color name="accent">@lineageos.platform:color/color_default_accent</color>
 
-    <color name="color_default_blue1">#007FFF</color>
+    <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
     <!--white-->
-    <color name="color_default_foreground">#FFFFFF</color>
+    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
     <!--black 80%-->
-    <color name="color_default_primary_text">#000000</color>
+    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
 
 
 </resources>
-- 
GitLab


From da7c47ed1cc2facd9e72d497b387c4804ebb63c7 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Thu, 31 Dec 2020 12:20:43 +0530
Subject: [PATCH 4/4] update color menu icon

---
 res/drawable/ic_menu_search.xml | 2 +-
 res/values/colors.xml           | 2 ++
 res/values/styles.xml           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/drawable/ic_menu_search.xml b/res/drawable/ic_menu_search.xml
index 45a98be0b..d3a787112 100644
--- a/res/drawable/ic_menu_search.xml
+++ b/res/drawable/ic_menu_search.xml
@@ -19,7 +19,7 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24"
-    android:tint="@color/color_default_blue1"
+    android:tint="@color/color_default_primary_text"
     >
     <path
         android:fillColor="?android:attr/colorControlNormal"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index fc3ca0061..47eb28ec1 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -57,4 +57,6 @@
     <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
 
 
+
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4c4810e25..f645ed130 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -58,7 +58,7 @@
     </style>
 
     <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/color_default_blue1</item>
+        <item name="android:tint">@color/color_default_primary_text</item>
         <item name="android:minWidth">@dimen/button_touch_size</item>
     </style>
 
-- 
GitLab