From 77b5addccfb68040665310a1b87c617a7a9c9915 Mon Sep 17 00:00:00 2001
From: hacker <hacker@example.com>
Date: Thu, 24 Dec 2020 17:40:12 +0530
Subject: [PATCH 1/6] PlayQueue_Ui_Update

---
 res/drawable/default_artwork_blur_2.xml              | 8 ++++++++
 res/drawable/menu_button_light.xml                   | 2 +-
 res/layout/blur_scrim_image.xml                      | 2 +-
 res/layout/edit_queue_list_item.xml                  | 2 ++
 res/layout/list_item_queue.xml                       | 2 +-
 res/values/colors.xml                                | 8 ++++----
 src/org/lineageos/eleven/widgets/BlurScrimImage.java | 2 +-
 7 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 res/drawable/default_artwork_blur_2.xml

diff --git a/res/drawable/default_artwork_blur_2.xml b/res/drawable/default_artwork_blur_2.xml
new file mode 100644
index 00000000..2e8518b4
--- /dev/null
+++ b/res/drawable/default_artwork_blur_2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid
+        android:color="@color/background_color"
+        />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/menu_button_light.xml b/res/drawable/menu_button_light.xml
index ef6f6ba3..5d8af81b 100644
--- a/res/drawable/menu_button_light.xml
+++ b/res/drawable/menu_button_light.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24h-24z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/list_item_text_color_light"
         android:pathData="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2
 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
 </vector>
diff --git a/res/layout/blur_scrim_image.xml b/res/layout/blur_scrim_image.xml
index 0afbd7ea..cd94007b 100644
--- a/res/layout/blur_scrim_image.xml
+++ b/res/layout/blur_scrim_image.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        android:src="@drawable/default_artwork_blur"/>
+        android:src="@drawable/default_artwork_blur_2"/>
     <LinearLayout
         android:id="@+id/blurScrim"
         android:layout_width="match_parent"
diff --git a/res/layout/edit_queue_list_item.xml b/res/layout/edit_queue_list_item.xml
index d57f2c34..e6a86248 100644
--- a/res/layout/edit_queue_list_item.xml
+++ b/res/layout/edit_queue_list_item.xml
@@ -26,6 +26,7 @@
         android:layout_height="@dimen/drag_and_drop_height"
         android:layout_centerVertical="true"
         android:scaleType="fitXY"
+        android:tint="@color/player_action_bar_subtitle_text_color"
         android:src="@drawable/gripper_light" />
 
     <FrameLayout
@@ -43,5 +44,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:tint="@color/player_action_bar_subtitle_text_color"
         android:src="@drawable/dnd_list_divider_light" />
 </RelativeLayout>
diff --git a/res/layout/list_item_queue.xml b/res/layout/list_item_queue.xml
index 657ea706..a41f5c5c 100644
--- a/res/layout/list_item_queue.xml
+++ b/res/layout/list_item_queue.xml
@@ -63,7 +63,7 @@
             android:layout_width="@dimen/list_item_progress_width"
             android:layout_height="@dimen/list_item_progress_height"
             android:layout_centerVertical="true"
-            layout="@layout/play_pause_progress_button"/>
+            layout="@layout/play_pause_progress_button_player_control"/>
     </FrameLayout>
 
     <org.lineageos.eleven.widgets.PopupMenuButton
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8e9aa9ed..5bcc2bd3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -59,7 +59,7 @@
     <color name="transparent_white">#99fafafa</color>
     <color name="transparent_blue">#993F51B5</color>
 
-    <color name="background_color">@color/white</color>
+    <color name="background_color">@color/header_action_bar_color</color>
 
     <!-- Color for the action bar -->
     <color name="header_action_bar_color">@color/primary</color>
@@ -83,7 +83,7 @@
     <color name="list_item_header_text_color">@color/black</color>
     <color name="list_item_search_footer_text_color">@color/accent</color>
     <color name="list_item_text_color">@color/default_text_color</color>
-    <color name="list_item_text_color_light">@color/default_text_color_light</color>
+    <color name="list_item_text_color_light">@color/player_action_bar_title_text_color</color>
     <color name="list_item_divider_color">#4c212121</color>
     <color name="list_item_divider_color_light">#34fafafa</color>
     <color name="grid_list_item_text_color">#b3212121</color>
@@ -109,7 +109,7 @@
 
     <!-- search no results text color -->
     <color name="no_results">@color/black</color>
-    <color name="no_results_light">@color/white</color>
+    <color name="no_results_light">@color/main_action_bar_text_color</color>
 
     <color name="now_playing_divider">@color/transparent</color>
 
@@ -151,7 +151,7 @@
 
     <!-- Separated and exposed values for themes -->
     <color name="widget_background_color">@color/black</color>
-    <color name="list_base_container_background_color">@color/white</color>
+    <color name="list_base_container_background_color">@color/background_color</color>
     <color name="activity_album_detail_background_color">@color/background_color</color>
     <color name="activity_artist_detail_background_color">@color/background_color</color>
     <color name="activity_base_background_color">@color/background_color</color>
diff --git a/src/org/lineageos/eleven/widgets/BlurScrimImage.java b/src/org/lineageos/eleven/widgets/BlurScrimImage.java
index 8a51cc2e..2b342f26 100644
--- a/src/org/lineageos/eleven/widgets/BlurScrimImage.java
+++ b/src/org/lineageos/eleven/widgets/BlurScrimImage.java
@@ -64,7 +64,7 @@ public class BlurScrimImage extends FrameLayout {
         }
 
         Bitmap blurredBitmap = ((BitmapDrawable) getResources()
-                .getDrawable(R.drawable.default_artwork_blur)).getBitmap();
+                .getDrawable(R.drawable.default_artwork_blur_2)).getBitmap();
 
         TransitionDrawable imageTransition = ImageWorker.createImageTransitionDrawable(getResources(),
                 mImageView.getDrawable(), blurredBitmap, ImageWorker.FADE_IN_TIME_SLOW, true, true);
-- 
GitLab


From 310cf12f44e61264cd8c775d0b08ee65d1e439c1 Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Mon, 28 Dec 2020 18:50:55 +0530
Subject: [PATCH 2/6] IconChanges_Pie

---
 res/layout/activity_base.xml           | 4 ++--
 res/layout/album_detail_song.xml       | 2 +-
 res/layout/artist_detail_album.xml     | 2 +-
 res/layout/artist_detail_song.xml      | 2 +-
 res/layout/audio_player_header_bar.xml | 4 ++--
 res/layout/grid_items_normal.xml       | 2 +-
 res/layout/header_bar.xml              | 4 ++--
 res/layout/list_item_common.xml        | 2 +-
 res/layout/list_item_queue.xml         | 2 +-
 res/layout/list_item_simple.xml        | 2 +-
 res/layout/list_item_top_tracks.xml    | 2 +-
 res/menu/search.xml                    | 2 +-
 res/menu/search_btn.xml                | 2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 974c1a68..628a74f6 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -111,8 +111,8 @@
                         android:layout_gravity="center_horizontal"
                         android:scaleType="centerInside"
                         android:tint="@color/white"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginEnd="5dp"
+                        android:layout_marginStart="20dp"
+                        android:layout_marginEnd="20dp"
                         android:src="@drawable/drag_indicator" />
 
                 </LinearLayout>
diff --git a/res/layout/album_detail_song.xml b/res/layout/album_detail_song.xml
index f4273a00..80bdc7e9 100644
--- a/res/layout/album_detail_song.xml
+++ b/res/layout/album_detail_song.xml
@@ -23,7 +23,7 @@
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
             android:gravity="center"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 
     <RelativeLayout
diff --git a/res/layout/artist_detail_album.xml b/res/layout/artist_detail_album.xml
index 3e7832b2..7f69315b 100644
--- a/res/layout/artist_detail_album.xml
+++ b/res/layout/artist_detail_album.xml
@@ -46,7 +46,7 @@
             android:layout_alignParentRight="true"
             android:layout_marginBottom="1dp"
             android:gravity="center_vertical"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout/artist_detail_song.xml b/res/layout/artist_detail_song.xml
index 01557d7b..6c79da44 100644
--- a/res/layout/artist_detail_song.xml
+++ b/res/layout/artist_detail_song.xml
@@ -33,7 +33,7 @@
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 
     <TextView
diff --git a/res/layout/audio_player_header_bar.xml b/res/layout/audio_player_header_bar.xml
index 68df30cf..23198bfb 100644
--- a/res/layout/audio_player_header_bar.xml
+++ b/res/layout/audio_player_header_bar.xml
@@ -50,7 +50,7 @@
             android:layout_weight="0"
             android:tint="@color/player_action_bar_title_text_color"
             android:background="@drawable/selectable_background"
-            android:src="@drawable/ic_action_search"
+            android:src="@lineageos.platform:drawable/ic_search"
             android:scaleType="centerInside" />
 
         <ImageView
@@ -62,7 +62,7 @@
             android:tint="@color/player_action_bar_title_text_color"
             android:scaleType="centerInside"
             android:background="@drawable/selectable_background"
-            android:src="@drawable/menu_button_light"/>
+            android:src="@lineageos.platform:drawable/ic_menu"/>
     </LinearLayout>
 
     <LinearLayout
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index fb047569..28c19511 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -68,7 +68,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginRight="@dimen/grid_item_padding_right"
-                android:src="@drawable/menu_button" />
+                android:src="@lineageos.platform:drawable/ic_menu" />
 
         </LinearLayout>
 
diff --git a/res/layout/header_bar.xml b/res/layout/header_bar.xml
index 5c9f4aab..a8030d28 100644
--- a/res/layout/header_bar.xml
+++ b/res/layout/header_bar.xml
@@ -57,7 +57,7 @@
         android:layout_gravity="center_vertical"
         android:layout_weight="0"
         android:tint="@color/player_action_bar_title_text_color"
-        android:src="@drawable/ic_action_search"
+        android:src="@lineageos.platform:drawable/ic_search"
         android:background="@drawable/selectable_background"
         android:scaleType="centerInside" />
 
@@ -70,6 +70,6 @@
         android:scaleType="centerInside"
         android:tint="@color/player_action_bar_title_text_color"
         android:background="@drawable/selectable_background"
-        android:src="@drawable/menu_button_light"/>
+        android:src="@lineageos.platform:drawable/ic_menu"/>
 
 </org.lineageos.eleven.ui.HeaderBar>
diff --git a/res/layout/list_item_common.xml b/res/layout/list_item_common.xml
index ecdf7825..383387b2 100644
--- a/res/layout/list_item_common.xml
+++ b/res/layout/list_item_common.xml
@@ -56,6 +56,6 @@
             android:id="@+id/popup_menu_button"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/res/layout/list_item_queue.xml b/res/layout/list_item_queue.xml
index a41f5c5c..f02ee432 100644
--- a/res/layout/list_item_queue.xml
+++ b/res/layout/list_item_queue.xml
@@ -72,5 +72,5 @@
         android:layout_height="@dimen/overflow_height"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:src="@drawable/menu_button_light" />
+        android:src="@lineageos.platform:drawable/ic_menu" />
 </RelativeLayout>
diff --git a/res/layout/list_item_simple.xml b/res/layout/list_item_simple.xml
index 6828376d..e6496e83 100644
--- a/res/layout/list_item_simple.xml
+++ b/res/layout/list_item_simple.xml
@@ -65,7 +65,7 @@
             android:layout_height="@dimen/overflow_height"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </RelativeLayout>
 
     <ImageView
diff --git a/res/layout/list_item_top_tracks.xml b/res/layout/list_item_top_tracks.xml
index 9bb464f4..2f966f39 100644
--- a/res/layout/list_item_top_tracks.xml
+++ b/res/layout/list_item_top_tracks.xml
@@ -95,7 +95,7 @@
                 android:id="@+id/popup_menu_button"
                 android:layout_width="@dimen/overflow_width"
                 android:layout_height="@dimen/overflow_height"
-                android:src="@drawable/menu_button" />
+                android:src="@lineageos.platform:drawable/ic_menu" />
         </LinearLayout>
     </RelativeLayout>
 
diff --git a/res/menu/search.xml b/res/menu/search.xml
index d0240a0c..06097fca 100644
--- a/res/menu/search.xml
+++ b/res/menu/search.xml
@@ -19,7 +19,7 @@
     <item
         android:id="@+id/menu_search"
         android:actionViewClass="android.widget.SearchView"
-        android:icon="@drawable/ic_action_search"
+        android:icon="@lineageos.platform:drawable/ic_search"
         android:orderInCategory="1"
         android:showAsAction="ifRoom|collapseActionView"
         android:title="@string/menu_search"/>
diff --git a/res/menu/search_btn.xml b/res/menu/search_btn.xml
index 417ed894..5b7f3c36 100644
--- a/res/menu/search_btn.xml
+++ b/res/menu/search_btn.xml
@@ -18,7 +18,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
         android:id="@+id/menu_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="@lineageos.platform:drawable/ic_search"
         android:orderInCategory="1"
         android:showAsAction="ifRoom"
         android:title="@string/menu_search"/>
-- 
GitLab


From b5e61ea1b619630895199a69b06a898e36e7aae9 Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Tue, 29 Dec 2020 09:55:04 +0530
Subject: [PATCH 3/6] IconChanges_Pie

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

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 83495aef..b433d41e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -31,6 +31,8 @@
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">false</item>
         <item name="android:windowAllowReturnTransitionOverlap">false</item>
+        <item name="android:statusBarColor">@color/primary</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 
     <style name="ActionBarWidgetTheme" parent="@android:style/Theme.Material">
-- 
GitLab


From 0bdaa395ba4f5e8fdba22b92e06d641f3e9d230a Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Tue, 29 Dec 2020 11:18:27 +0530
Subject: [PATCH 4/6] status bar color

---
 src/org/lineageos/eleven/ui/activities/HomeActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/lineageos/eleven/ui/activities/HomeActivity.java b/src/org/lineageos/eleven/ui/activities/HomeActivity.java
index d17821c2..7ad70515 100644
--- a/src/org/lineageos/eleven/ui/activities/HomeActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/HomeActivity.java
@@ -569,7 +569,7 @@ public class HomeActivity extends SlidingPanelActivity implements
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
 
-            window.setStatusBarColor(darkenColor(color_accent));
+            window.setStatusBarColor(getResources().getColor(R.color.primary_dark));
         }
 
         return color_accent;
-- 
GitLab


From 9f43f1d59dd58ea2eea351176e70c91566121ebd Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Tue, 29 Dec 2020 12:52:58 +0530
Subject: [PATCH 5/6] status bar color and icon changes

---
 src/org/lineageos/eleven/ui/activities/BaseActivity.java        | 2 +-
 src/org/lineageos/eleven/ui/activities/HomeActivity.java        | 2 +-
 src/org/lineageos/eleven/ui/activities/SearchActivity.java      | 2 +-
 .../lineageos/eleven/ui/activities/SlidingPanelActivity.java    | 2 +-
 .../eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/lineageos/eleven/ui/activities/BaseActivity.java b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
index 520a722a..d26f4981 100644
--- a/src/org/lineageos/eleven/ui/activities/BaseActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
@@ -535,7 +535,7 @@ public abstract class BaseActivity extends FragmentActivity implements ServiceCo
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
 
-            window.setStatusBarColor(darkenColor(color_accent));
+//            window.setStatusBarColor(darkenColor(color_accent));
         }
 
         return color_accent;
diff --git a/src/org/lineageos/eleven/ui/activities/HomeActivity.java b/src/org/lineageos/eleven/ui/activities/HomeActivity.java
index 7ad70515..df6b1787 100644
--- a/src/org/lineageos/eleven/ui/activities/HomeActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/HomeActivity.java
@@ -569,7 +569,7 @@ public class HomeActivity extends SlidingPanelActivity implements
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
 
-            window.setStatusBarColor(getResources().getColor(R.color.primary_dark));
+//            window.setStatusBarColor(darkenColor(color_accent));
         }
 
         return color_accent;
diff --git a/src/org/lineageos/eleven/ui/activities/SearchActivity.java b/src/org/lineageos/eleven/ui/activities/SearchActivity.java
index 4a5ad5f9..6b130a43 100644
--- a/src/org/lineageos/eleven/ui/activities/SearchActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SearchActivity.java
@@ -1013,7 +1013,7 @@ public class SearchActivity extends FragmentActivity implements
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
 
-            window.setStatusBarColor(darkenColor(color_accent));
+//            window.setStatusBarColor(darkenColor(color_accent));
         }
 
         return color_accent;
diff --git a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
index 53098a43..623a2824 100644
--- a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
@@ -363,7 +363,7 @@ public abstract class SlidingPanelActivity extends BaseActivity {
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
 
-            window.setStatusBarColor(darkenColor(color_accent));
+//            window.setStatusBarColor(darkenColor(color_accent));
         }
 
         return color_accent;
diff --git a/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java b/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
index c3265ec2..4abf2287 100644
--- a/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
@@ -367,7 +367,7 @@ public class MusicBrowserPhoneFragment extends BaseFragment {
             Window window = getActivity().getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
 
-            window.setStatusBarColor(darkenColor(color_accent));
+//            window.setStatusBarColor(darkenColor(color_accent));
         }
 
         return color_accent;
-- 
GitLab


From 5a0102f1d02c89ee6d6f5883cf0ecaad241c8037 Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Tue, 29 Dec 2020 15:20:17 +0530
Subject: [PATCH 6/6] Action bar color in ArtistDetailFragment and also change
 header View

---
 res/layout/artist_detail_header.xml           |  1 +
 res/values/styles.xml                         |  1 +
 .../ui/fragments/ArtistDetailFragment.java    | 56 +++++++++++--------
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/res/layout/artist_detail_header.xml b/res/layout/artist_detail_header.xml
index 3bdff8d9..08eee9e4 100644
--- a/res/layout/artist_detail_header.xml
+++ b/res/layout/artist_detail_header.xml
@@ -7,6 +7,7 @@
         android:id="@+id/hero"
         android:layout_width="match_parent"
         android:layout_height="222dp"
+        android:layout_marginTop="?android:attr/actionBarSize"
         android:gravity="center" />
 
     <TextView
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b433d41e..1ab22202 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -33,6 +33,7 @@
         <item name="android:windowAllowReturnTransitionOverlap">false</item>
         <item name="android:statusBarColor">@color/primary</item>
         <item name="android:windowLightStatusBar">true</item>
+        <item name="android:homeAsUpIndicator">@lineageos.platform:drawable/ic_back</item>
     </style>
 
     <style name="ActionBarWidgetTheme" parent="@android:style/Theme.Material">
diff --git a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
index f346033b..8cb415de 100644
--- a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
@@ -1,20 +1,21 @@
 /*
-* Copyright (C) 2014 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.
-*/
+ * Copyright (C) 2014 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 org.lineageos.eleven.ui.fragments;
 
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
 import android.support.v7.widget.LinearLayoutManager;
@@ -24,6 +25,7 @@ import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.ListView;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.ArtistDetailAlbumAdapter;
@@ -66,7 +68,9 @@ public class ArtistDetailFragment extends FadingBarFragment implements IChildFra
     private LoadingEmptyContainer mLoadingEmptyContainer;
 
     @Override
-    protected int getLayoutToInflate() { return R.layout.activity_artist_detail; }
+    protected int getLayoutToInflate() {
+        return R.layout.activity_artist_detail;
+    }
 
     @Override
     protected String getTitle() {
@@ -95,6 +99,8 @@ public class ArtistDetailFragment extends FadingBarFragment implements IChildFra
         LoaderManager lm = getLoaderManager();
         lm.initLoader(ALBUM_LOADER_ID, arguments, mAlbumAdapter);
         lm.initLoader(SONG_LOADER_ID, arguments, mSongAdapter);
+        if (getContainingActivity().getActionBar() != null)
+            getContainingActivity().getActionBar().setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.primary_dark)));
     }
 
     @Override // DetailFragment
@@ -107,7 +113,9 @@ public class ArtistDetailFragment extends FadingBarFragment implements IChildFra
     }
 
     @Override // DetailFragment
-    protected int getShuffleTitleId() { return R.string.menu_shuffle_artist; }
+    protected int getShuffleTitleId() {
+        return R.string.menu_shuffle_artist;
+    }
 
     @Override // DetailFragment
     protected void playShuffled() {
@@ -115,12 +123,13 @@ public class ArtistDetailFragment extends FadingBarFragment implements IChildFra
     }
 
     private void setupHero(String artistName) {
-        mHero = (ImageView)mHeader.findViewById(R.id.hero);
+
+        mHero = (ImageView) mHeader.findViewById(R.id.hero);
         mHero.setContentDescription(artistName);
         // initiate loading the artist image
         // since the artist image needs to be scaled to the image view bounds, we need to wait till the first layout
         // traversal to be able to get the image view dimensions in the helper method that scales the image
-        mHero.getViewTreeObserver().addOnGlobalLayoutListener( new ViewTreeObserver.OnGlobalLayoutListener() {
+        mHero.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
             @Override
             public void onGlobalLayout() {
                 mHero.getViewTreeObserver().removeOnGlobalLayoutListener(this);
@@ -144,7 +153,7 @@ public class ArtistDetailFragment extends FadingBarFragment implements IChildFra
     }
 
     private void setupSongList() {
-        mSongs = (ListView)mRootView.findViewById(R.id.songs);
+        mSongs = (ListView) mRootView.findViewById(R.id.songs);
         mHeader = LayoutInflater.from(getActivity()).
                 inflate(R.layout.artist_detail_header, mSongs, false);
         mSongs.addHeaderView(mHeader);
@@ -171,7 +180,7 @@ public class ArtistDetailFragment extends FadingBarFragment implements IChildFra
         mSongs.setAdapter(mSongAdapter);
         mSongs.setOnItemClickListener(mSongAdapter);
         mLoadingEmptyContainer =
-                (LoadingEmptyContainer)mRootView.findViewById(R.id.loading_empty_container);
+                (LoadingEmptyContainer) mRootView.findViewById(R.id.loading_empty_container);
         mSongs.setEmptyView(mLoadingEmptyContainer);
     }
 
@@ -218,9 +227,12 @@ public class ArtistDetailFragment extends FadingBarFragment implements IChildFra
     }
 
     // TODO: change this class to use the same header strategy as PlaylistDetail
-    protected int getHeaderHeight() { return mHero.getHeight(); }
+    protected int getHeaderHeight() {
+        return mHero.getHeight();
+    }
 
-    protected void setHeaderPosition(float y) {  }
+    protected void setHeaderPosition(float y) {
+    }
 
     @Override
     public void restartLoader() {
-- 
GitLab