From 9de79fa7ce17987115a7c63e5e21d3a6fccae493 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Thu, 3 Dec 2020 15:25:52 +0530
Subject: [PATCH 01/20] setup Color and update status barIcon color and Toolbar
 Icons

---
 res/values/colors.xml |  8 ++++++++
 res/values/styles.xml | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0ae5a0e24..b9f7b67ac 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -83,4 +83,12 @@
     <color name="inspector_section_title">#ff939393</color>
     <color name="inspector_section_divider">#E0E0E0</color>
     <color name="inspector_title_background">#40000000</color>
+
+    <color name="color_default_blue1">#007FFF</color>
+    <!--white-->
+    <color name="color_default_foreground">#FFFFFF</color>
+    <!--black 80%-->
+    <color name="color_default_primary_text">#000000</color>
+
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 950b90345..cbcc5dd84 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,13 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="ActionBarTheme" parent="@*android:style/ThemeOverlay.Material.Dark.ActionBar">
-        <item name="android:colorControlNormal">@android:color/white</item>
+        <item name="android:colorControlNormal">@color/color_default_blue1</item>
         <item name="android:textSelectHandle">@drawable/text_select_handle_middle</item>
         <item name="android:textSelectHandleLeft">@drawable/text_select_handle_left</item>
         <item name="android:textSelectHandleRight">@drawable/text_select_handle_right</item>
         <item name="android:textCursorDrawable">@drawable/text_cursor</item>
         <item name="android:textColorHighlight">@color/text_highlight</item>
-        <item name="android:textColorPrimary">@android:color/white</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+
+        <item name="android:textColorSecondary">@color/color_default_primary_text</item>
     </style>
     <style name="ActionBarPopupTheme" parent="@style/Theme.AppCompat.DayNight" />
 
@@ -46,8 +48,13 @@
         <item name="android:windowNoTitle">true</item>
 
         <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
+        <!--statusbar icons color-->
+        <item name="android:windowLightStatusBar">true</item>
+
     </style>
 
+
+
     <style name="TrimmedHorizontalProgressBar" parent="android:Widget.Material.ProgressBar.Horizontal">
         <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_material_trimmed</item>
         <item name="android:minHeight">3dp</item>
-- 
GitLab


From 11c9e74334e84f403a46f9aacd6d86f5b95e93c8 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Thu, 3 Dec 2020 18:36:28 +0530
Subject: [PATCH 02/20] update primary dark and toolbar color to white

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

diff --git a/res/values/colors.xml b/res/values/colors.xml
index b9f7b67ac..71f3ca7cd 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -24,7 +24,7 @@
     <color name="directory_background">#fff7f7f7</color>
     <color name="menu_search_background">@android:color/transparent</color>
 
-    <color name="primary_dark">#ff254FAE</color>
+    <color name="primary_dark">@color/color_default_foreground</color>
     <color name="primary">@color/tool_bar_color</color>
     <!--<color name="accent">@color/tool_bar_color</color>-->
     <color name="accent">@*android:color/accent_device_default</color>
@@ -50,7 +50,7 @@
     <color name="root_icon_color">#ff5a5a5a</color>
     <item name="root_icon_disabled_alpha" format="float" type="dimen">@*android:dimen/disabled_alpha_material_light</item>
     <color name="doc_icon_color">#ff5a5a5a</color>
-    <color name="tool_bar_color">#ff1A73E8</color>
+    <color name="tool_bar_color">@color/color_default_foreground</color>
 
     <!-- TODO: Would be nice to move this to a color-set, but not sure how to support animation -->
     <color name="item_doc_title">#ff333333</color>
-- 
GitLab


From 4f600eb307fcc160deda6ae1f4555133f944ab22 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Thu, 3 Dec 2020 20:21:16 +0530
Subject: [PATCH 03/20] remove os accent color

---
 res/values/colors.xml                         |  4 ++--
 src/com/android/documentsui/BaseActivity.java | 21 -------------------
 .../android/documentsui/DrawerController.java |  6 ------
 .../documentsui/files/LauncherActivity.java   |  6 ------
 4 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 71f3ca7cd..c882df297 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -27,9 +27,9 @@
     <color name="primary_dark">@color/color_default_foreground</color>
     <color name="primary">@color/tool_bar_color</color>
     <!--<color name="accent">@color/tool_bar_color</color>-->
-    <color name="accent">@*android:color/accent_device_default</color>
+    <color name="accent">@color/color_default_blue1</color>
 <!--    <color name="colorAccent">@*android:color/accent_device_default</color>-->
-    <color name="accent_dark">@*android:color/accent_device_default_dark</color>
+    <color name="accent_dark">@color/color_default_blue1</color>
 
     <color name="text_cursor">@*android:color/white</color>
     <color name="text_handle">#FF82B1FF</color>     <!--Blue A100-->
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index 13e251233..7569b39a1 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -694,30 +694,9 @@ public abstract class BaseActivity
 
     private int fetchAccentColor() {
         int color=getResources().getColor(R.color.accent);
-       /* TypedValue typedValue = new TypedValue();
-        TypedArray a = activity.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent });
-        int color = a.getColor(0, 0);
-        a.recycle();*/
-        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));
-       //toolbar change color to accent color
-        toolbar.setBackgroundColor(color);
-
-        //change status bar color
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(darkenColor(color));
-        }
-
         return color;
     }
 
 
-    int darkenColor(int color) {
-        float[] hsv = new float[3];
-        android.graphics.Color.colorToHSV(color, hsv);
-        hsv[2] *= 0.8f;
-        return android.graphics.Color.HSVToColor(hsv);
-    }
 
 }
diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index 51dbda611..71ebd38a1 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -276,12 +276,6 @@ public abstract class DrawerController implements DrawerListener {
     private static int fetchAccentColor(Activity activity) {
 
         int color=activity.getResources().getColor(R.color.accent);
-       /* TypedValue typedValue = new TypedValue();
-        TypedArray a = activity.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent });
-        int color = a.getColor(0, 0);
-        a.recycle();*/
-        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));
-        //toolbar change color to accent color
         return color;
     }
 }
diff --git a/src/com/android/documentsui/files/LauncherActivity.java b/src/com/android/documentsui/files/LauncherActivity.java
index 59d5c8e85..7e288c448 100644
--- a/src/com/android/documentsui/files/LauncherActivity.java
+++ b/src/com/android/documentsui/files/LauncherActivity.java
@@ -182,12 +182,6 @@ public class LauncherActivity extends Activity {
 
     private int fetchAccentColor() {
         int color=getResources().getColor(R.color.accent);
-       /* TypedValue typedValue = new TypedValue();
-        TypedArray a = activity.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent });
-        int color = a.getColor(0, 0);
-        a.recycle();*/
-        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));
-        //toolbar change color to accent color
         return color;
     }
 
-- 
GitLab


From 32ba4e9a79f6f09f7ebd9d5f0be91d4b5c6d6931 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Thu, 3 Dec 2020 21:28:38 +0530
Subject: [PATCH 04/20] update menu icon color blue to black, Drawer toolbar
 title color to white

---
 res/drawable/ic_doc_folder.xml                    | 4 +++-
 res/drawable/ic_doc_image.xml                     | 4 +++-
 res/values/styles.xml                             | 5 +++++
 src/com/android/documentsui/DrawerController.java | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/res/drawable/ic_doc_folder.xml b/res/drawable/ic_doc_folder.xml
index dcbce0108..21c3bb213 100644
--- a/res/drawable/ic_doc_folder.xml
+++ b/res/drawable/ic_doc_folder.xml
@@ -17,7 +17,9 @@ Copyright (C) 2015 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+    android:tint="@color/color_default_blue1"
+    >
     <path
         android:fillColor="#FF737373"
         android:pathData="M10 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V8c0,-1.1,-.9,-2,-2,-2h-8l-2,-2z"/>
diff --git a/res/drawable/ic_doc_image.xml b/res/drawable/ic_doc_image.xml
index 126256365..0fb43d424 100644
--- a/res/drawable/ic_doc_image.xml
+++ b/res/drawable/ic_doc_image.xml
@@ -17,7 +17,9 @@ Copyright (C) 2017 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+    android:tint="@color/color_default_blue1"
+    >
     <path
         android:fillColor="#FFDB4437"
         android:pathData="M21 19V5c0,-1.1,-.9,-2,-2,-2H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5,-4.5z"/>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cbcc5dd84..1722b2077 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -26,9 +26,14 @@
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
 
         <item name="android:textColorSecondary">@color/color_default_primary_text</item>
+        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
     </style>
     <style name="ActionBarPopupTheme" parent="@style/Theme.AppCompat.DayNight" />
 
+    <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">@color/color_default_primary_text</item>
+    </style>
+
     <style name="DocumentsTheme" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
         <item name="actionBarWidgetTheme">@null</item>
         <item name="actionBarTheme">@style/ActionBarTheme</item>
diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index 71ebd38a1..649406d16 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -34,6 +34,7 @@ import android.widget.Toolbar;
 
 import com.android.documentsui.base.Display;
 
+import java.awt.Color;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -70,6 +71,7 @@ public abstract class DrawerController implements DrawerListener {
 
         if(accentColor!=0){
             toolbar.setBackgroundColor(accentColor);
+
         }
 
         drawer.getLayoutParams().width = calculateDrawerWidth(activity);
@@ -204,6 +206,7 @@ public abstract class DrawerController implements DrawerListener {
         @Override
         void setTitle(String title) {
             mToolbar.setTitle(title);
+            mToolbar.setTitleTextColor(Color.WHITE);
         }
 
         @Override
-- 
GitLab


From 855fb2d1daacc904b140395e9a4412ce4fd169e2 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Thu, 3 Dec 2020 21:38:04 +0530
Subject: [PATCH 05/20] update text cursor color

---
 res/values/colors.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/colors.xml b/res/values/colors.xml
index c882df297..af773783a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -31,7 +31,7 @@
 <!--    <color name="colorAccent">@*android:color/accent_device_default</color>-->
     <color name="accent_dark">@color/color_default_blue1</color>
 
-    <color name="text_cursor">@*android:color/white</color>
+    <color name="text_cursor">@color/accent</color>
     <color name="text_handle">#FF82B1FF</color>     <!--Blue A100-->
     <color name="text_highlight">#FF82B1FF</color>  <!--Blue A100-->
 
-- 
GitLab


From 47b9810c1909301019ea3b5bd16e6700b1aea5ec Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Fri, 4 Dec 2020 00:02:01 +0530
Subject: [PATCH 06/20] update text cursor color :bug fixed

---
 src/com/android/documentsui/DrawerController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index 649406d16..b14547c80 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -34,7 +34,7 @@ import android.widget.Toolbar;
 
 import com.android.documentsui.base.Display;
 
-import java.awt.Color;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -206,7 +206,7 @@ public abstract class DrawerController implements DrawerListener {
         @Override
         void setTitle(String title) {
             mToolbar.setTitle(title);
-            mToolbar.setTitleTextColor(Color.WHITE);
+            mToolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground));
         }
 
         @Override
-- 
GitLab


From 7ef013013e60d7e96060ae124cfc516d747e9478 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Fri, 4 Dec 2020 07:17:20 +0530
Subject: [PATCH 07/20] update text cursor color :bug fixed

---
 src/com/android/documentsui/DrawerController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index b14547c80..7b15789d5 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -206,7 +206,7 @@ public abstract class DrawerController implements DrawerListener {
         @Override
         void setTitle(String title) {
             mToolbar.setTitle(title);
-            mToolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground));
+            mToolbar.setTitleTextColor(mActivity.getResources().getColor(R.color.color_default_foreground));
         }
 
         @Override
-- 
GitLab


From 87532a3c453b854fed93a86324fbad3d05fb2348 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Fri, 4 Dec 2020 07:41:09 +0530
Subject: [PATCH 08/20] update text cursor color :bug fixed

---
 src/com/android/documentsui/DrawerController.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index 7b15789d5..7a1d21791 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -58,7 +58,7 @@ public abstract class DrawerController implements DrawerListener {
      * Returns a controller suitable for {@code Layout}.
      */
     public static DrawerController create(Activity activity, ActivityConfig activityConfig) {
-        accentColor=fetchAccentColor(activity);
+
         DrawerLayout layout = (DrawerLayout) activity.findViewById(R.id.drawer_layout);
 
         if (layout == null) {
@@ -68,6 +68,7 @@ public abstract class DrawerController implements DrawerListener {
         View drawer = activity.findViewById(R.id.drawer_roots);
         Toolbar toolbar = (Toolbar) activity.findViewById(R.id.roots_toolbar);
 
+        accentColor=fetchAccentColor(activity, toolbar);
 
         if(accentColor!=0){
             toolbar.setBackgroundColor(accentColor);
@@ -206,7 +207,7 @@ public abstract class DrawerController implements DrawerListener {
         @Override
         void setTitle(String title) {
             mToolbar.setTitle(title);
-            mToolbar.setTitleTextColor(mActivity.getResources().getColor(R.color.color_default_foreground));
+            //mToolbar.setTitleTextColor(mActivity.getResources().getColor(R.color.color_default_foreground));
         }
 
         @Override
@@ -276,9 +277,11 @@ public abstract class DrawerController implements DrawerListener {
      * get Accent color from OS
      * */
 
-    private static int fetchAccentColor(Activity activity) {
+    private static int fetchAccentColor(Activity activity, Toolbar toolbar) {
 
         int color=activity.getResources().getColor(R.color.accent);
+        toolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground));
+
         return color;
     }
 }
-- 
GitLab


From d74ccf747ae0d4335820a51f18aa15a4a90cc02a Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Fri, 4 Dec 2020 08:51:19 +0530
Subject: [PATCH 09/20] update color control normal

---
 res/values/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1722b2077..66ffa33b1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="ActionBarTheme" parent="@*android:style/ThemeOverlay.Material.Dark.ActionBar">
-        <item name="android:colorControlNormal">@color/color_default_blue1</item>
+        <item name="android:colorControlNormal">@color/color_default_primary_text</item>
         <item name="android:textSelectHandle">@drawable/text_select_handle_middle</item>
         <item name="android:textSelectHandleLeft">@drawable/text_select_handle_left</item>
         <item name="android:textSelectHandleRight">@drawable/text_select_handle_right</item>
-- 
GitLab


From 5f449e58386325350de2056c5e2e6b601b5357b1 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Fri, 4 Dec 2020 09:44:47 +0530
Subject: [PATCH 10/20] update color control normal and toggle icon color

---
 res/values/styles.xml                             | 2 +-
 src/com/android/documentsui/DrawerController.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 66ffa33b1..1722b2077 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="ActionBarTheme" parent="@*android:style/ThemeOverlay.Material.Dark.ActionBar">
-        <item name="android:colorControlNormal">@color/color_default_primary_text</item>
+        <item name="android:colorControlNormal">@color/color_default_blue1</item>
         <item name="android:textSelectHandle">@drawable/text_select_handle_middle</item>
         <item name="android:textSelectHandleLeft">@drawable/text_select_handle_left</item>
         <item name="android:textSelectHandleRight">@drawable/text_select_handle_right</item>
diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index 7a1d21791..ff66ae2c9 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -281,7 +281,7 @@ public abstract class DrawerController implements DrawerListener {
 
         int color=activity.getResources().getColor(R.color.accent);
         toolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground));
-
+        mToggle.getDrawerArrowDrawable().setColor(activity.getResources().getColor(R.color.color_default_primary_text));
         return color;
     }
 }
-- 
GitLab


From 594114ac551fa4903e974fbd6fde23432cfc4c4f Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Fri, 4 Dec 2020 10:26:52 +0530
Subject: [PATCH 11/20] update color control normal and toggle icon color : bug
 fixed

---
 src/com/android/documentsui/DrawerController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index ff66ae2c9..67270bc28 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -281,7 +281,7 @@ public abstract class DrawerController implements DrawerListener {
 
         int color=activity.getResources().getColor(R.color.accent);
         toolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground));
-        mToggle.getDrawerArrowDrawable().setColor(activity.getResources().getColor(R.color.color_default_primary_text));
+        mToggle.getDrawerArrowDrawable().setColor(activity.getResources().getColor(R.color.color_default_foreground));
         return color;
     }
 }
-- 
GitLab


From 4fa43b57e30d01e3e526ac52229796fc5f103863 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Fri, 4 Dec 2020 10:49:11 +0530
Subject: [PATCH 12/20] update color control normal and toggle icon color : bug
 fixed

---
 .../android/documentsui/DrawerController.java    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index 67270bc28..03b2f28d3 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -68,13 +68,6 @@ public abstract class DrawerController implements DrawerListener {
         View drawer = activity.findViewById(R.id.drawer_roots);
         Toolbar toolbar = (Toolbar) activity.findViewById(R.id.roots_toolbar);
 
-        accentColor=fetchAccentColor(activity, toolbar);
-
-        if(accentColor!=0){
-            toolbar.setBackgroundColor(accentColor);
-
-        }
-
         drawer.getLayoutParams().width = calculateDrawerWidth(activity);
 
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
@@ -84,6 +77,9 @@ public abstract class DrawerController implements DrawerListener {
                 R.string.drawer_open,
                 R.string.drawer_close);
 
+
+        accentColor=fetchAccentColor(activity, toolbar, toggle);
+
         return new RuntimeDrawerController(layout, drawer, toggle, toolbar, activityConfig);
     }
 
@@ -277,11 +273,13 @@ public abstract class DrawerController implements DrawerListener {
      * get Accent color from OS
      * */
 
-    private static int fetchAccentColor(Activity activity, Toolbar toolbar) {
+    private static int fetchAccentColor(Activity activity, Toolbar toolbar, ActionBarDrawerToggle toggle) {
 
         int color=activity.getResources().getColor(R.color.accent);
+
+        toolbar.setBackgroundColor(color);
         toolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground));
-        mToggle.getDrawerArrowDrawable().setColor(activity.getResources().getColor(R.color.color_default_foreground));
+        toggle.getDrawerArrowDrawable().setColor(activity.getResources().getColor(R.color.color_default_foreground));
         return color;
     }
 }
-- 
GitLab


From ea556bb2a773e4deec163fda088d8085218b92d2 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Fri, 4 Dec 2020 11:16:39 +0530
Subject: [PATCH 13/20] update color control normal and toggle icon color : bug
 fixed

---
 res/drawable/ic_hamburger.xml                     | 2 +-
 src/com/android/documentsui/DrawerController.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml
index 7cda32e46..97cd27f2c 100644
--- a/res/drawable/ic_hamburger.xml
+++ b/res/drawable/ic_hamburger.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_hamburger_alpha"
-    android:tint="?android:attr/colorControlNormal" />
+    android:tint="@color/color_default_blue1" />
diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index 03b2f28d3..0f22f7364 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -279,7 +279,7 @@ public abstract class DrawerController implements DrawerListener {
 
         toolbar.setBackgroundColor(color);
         toolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground));
-        toggle.getDrawerArrowDrawable().setColor(activity.getResources().getColor(R.color.color_default_foreground));
+
         return color;
     }
 }
-- 
GitLab


From e8fb245c47f1bfc8a0054e8c2443cebb26b7514f Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Fri, 4 Dec 2020 11:58:17 +0530
Subject: [PATCH 14/20] update color ic_hamburger

---
 res/drawable/ic_hamburger.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml
index 97cd27f2c..6b15fb5be 100644
--- a/res/drawable/ic_hamburger.xml
+++ b/res/drawable/ic_hamburger.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_hamburger_alpha"
-    android:tint="@color/color_default_blue1" />
+    android:tint="@color/color_default_primary_text" />
-- 
GitLab


From a3959d6ba28e7c69b1b524d0af8fe11dd5439dff Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Tue, 8 Dec 2020 15:28:46 +0530
Subject: [PATCH 15/20] update color from UI-SDK

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

diff --git a/res/values/colors.xml b/res/values/colors.xml
index af773783a..df90d0aa3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -84,11 +84,11 @@
     <color name="inspector_section_divider">#E0E0E0</color>
     <color name="inspector_title_background">#40000000</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 5700ce42742b869bb6eaf2fa56678b0ef49f751f Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Tue, 22 Dec 2020 08:36:13 +0530
Subject: [PATCH 16/20] update hamburger icon and menu icon color

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

diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml
index 6b15fb5be..97cd27f2c 100644
--- a/res/drawable/ic_hamburger.xml
+++ b/res/drawable/ic_hamburger.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_hamburger_alpha"
-    android:tint="@color/color_default_primary_text" />
+    android:tint="@color/color_default_blue1" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index df90d0aa3..448cbfd10 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -27,9 +27,9 @@
     <color name="primary_dark">@color/color_default_foreground</color>
     <color name="primary">@color/tool_bar_color</color>
     <!--<color name="accent">@color/tool_bar_color</color>-->
-    <color name="accent">@color/color_default_blue1</color>
+    <color name="accent">@color/color_default_accent</color>
 <!--    <color name="colorAccent">@*android:color/accent_device_default</color>-->
-    <color name="accent_dark">@color/color_default_blue1</color>
+    <color name="accent_dark">@color/color_default_accent</color>
 
     <color name="text_cursor">@color/accent</color>
     <color name="text_handle">#FF82B1FF</color>     <!--Blue A100-->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1722b2077..66ffa33b1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="ActionBarTheme" parent="@*android:style/ThemeOverlay.Material.Dark.ActionBar">
-        <item name="android:colorControlNormal">@color/color_default_blue1</item>
+        <item name="android:colorControlNormal">@color/color_default_primary_text</item>
         <item name="android:textSelectHandle">@drawable/text_select_handle_middle</item>
         <item name="android:textSelectHandleLeft">@drawable/text_select_handle_left</item>
         <item name="android:textSelectHandleRight">@drawable/text_select_handle_right</item>
-- 
GitLab


From 5124f4957a082feee29bf67c91210239db91c204 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Tue, 22 Dec 2020 09:24:44 +0530
Subject: [PATCH 17/20] update hamburger icon and menu icon color: bug fixed
 and test for icon

---
 res/values/colors.xml                          | 4 ++--
 src/com/android/documentsui/base/RootInfo.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 448cbfd10..4c1d85b6c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -27,9 +27,9 @@
     <color name="primary_dark">@color/color_default_foreground</color>
     <color name="primary">@color/tool_bar_color</color>
     <!--<color name="accent">@color/tool_bar_color</color>-->
-    <color name="accent">@color/color_default_accent</color>
+    <color name="accent">@lineageos.platform:color/color_default_accent</color>
 <!--    <color name="colorAccent">@*android:color/accent_device_default</color>-->
-    <color name="accent_dark">@color/color_default_accent</color>
+    <color name="accent_dark">@lineageos.platform:color/color_default_accent</color>
 
     <color name="text_cursor">@color/accent</color>
     <color name="text_handle">#FF82B1FF</color>     <!--Blue A100-->
diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java
index 340d61459..c7def5b5d 100644
--- a/src/com/android/documentsui/base/RootInfo.java
+++ b/src/com/android/documentsui/base/RootInfo.java
@@ -202,7 +202,7 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> {
 
         if (isHome()) {
             derivedType = TYPE_LOCAL;
-            derivedIcon = R.drawable.ic_root_documents;
+            derivedIcon = R.drawable.ic_usb_storage;//R.drawable.ic_root_documents;
         } else if (isMtp()) {
             derivedType = TYPE_MTP;
             derivedIcon = R.drawable.ic_usb_storage;
-- 
GitLab


From d1899aeaefce8831ddcd702ddae893b824471836 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Tue, 22 Dec 2020 09:25:58 +0530
Subject: [PATCH 18/20] update hamburger icon and menu icon color: bug fixed
 and test for icon

---
 src/com/android/documentsui/base/RootInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java
index c7def5b5d..0be4504d7 100644
--- a/src/com/android/documentsui/base/RootInfo.java
+++ b/src/com/android/documentsui/base/RootInfo.java
@@ -202,7 +202,7 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> {
 
         if (isHome()) {
             derivedType = TYPE_LOCAL;
-            derivedIcon = R.drawable.ic_usb_storage;//R.drawable.ic_root_documents;
+            derivedIcon = lineageos.platform.R.drawable.ic_camera_video;//R.drawable.ic_root_documents;
         } else if (isMtp()) {
             derivedType = TYPE_MTP;
             derivedIcon = R.drawable.ic_usb_storage;
-- 
GitLab


From 16547343afcfd03156975236de442b9fe211fa34 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Tue, 22 Dec 2020 10:45:53 +0530
Subject: [PATCH 19/20] update hamburger icon and menu icon color: bug fixed
 and test for icon

---
 src/com/android/documentsui/base/RootInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java
index 0be4504d7..c7def5b5d 100644
--- a/src/com/android/documentsui/base/RootInfo.java
+++ b/src/com/android/documentsui/base/RootInfo.java
@@ -202,7 +202,7 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> {
 
         if (isHome()) {
             derivedType = TYPE_LOCAL;
-            derivedIcon = lineageos.platform.R.drawable.ic_camera_video;//R.drawable.ic_root_documents;
+            derivedIcon = R.drawable.ic_usb_storage;//R.drawable.ic_root_documents;
         } else if (isMtp()) {
             derivedType = TYPE_MTP;
             derivedIcon = R.drawable.ic_usb_storage;
-- 
GitLab


From 65eed3c5517683e684441c14e164c06dc3676878 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Tue, 22 Dec 2020 13:05:59 +0530
Subject: [PATCH 20/20] update hamburger icon and menu icon color: bug fixed

---
 src/com/android/documentsui/base/RootInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java
index c7def5b5d..340d61459 100644
--- a/src/com/android/documentsui/base/RootInfo.java
+++ b/src/com/android/documentsui/base/RootInfo.java
@@ -202,7 +202,7 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> {
 
         if (isHome()) {
             derivedType = TYPE_LOCAL;
-            derivedIcon = R.drawable.ic_usb_storage;//R.drawable.ic_root_documents;
+            derivedIcon = R.drawable.ic_root_documents;
         } else if (isMtp()) {
             derivedType = TYPE_MTP;
             derivedIcon = R.drawable.ic_usb_storage;
-- 
GitLab