From 0f083270ba769bd600f8d63a9c3b4f95c3e3575a Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sun, 16 Aug 2015 23:27:33 +0200
Subject: [PATCH] Removed unnecessary statusbar elevation in the now playing
 view

---
 app/src/main/assets/changelog.html               |  2 ++
 .../base/AbsSlidingMusicPanelActivity.java       | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index c42b50cb..b5df6861 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -45,6 +45,8 @@
     </li>
     <li><b>FIX:</b> Album and artist list not scrolling when trying to drag from their title bar.
     </li>
+    <li><b>FIX:</b> Removed unnecessary statusbar elevation in the now playing view.
+    </li>
 </ol>
 
 <h3>Version 0.9.43 beta1</h3>
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
index 8b2269a2..4bc7e7bd 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
@@ -181,6 +181,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
         setUpMusicControllers();
         setUpAlbumArtViews();
         setUpPlayerToolbar();
+        setUpPlayerStatusBarElevation();
 
         progressViewsUpdateHandler = new MusicProgressViewsUpdateHandler(this);
 
@@ -248,9 +249,8 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
                 // do not break here
             case PreferenceUtil.OPAQUE_TOOLBAR_NOW_PLAYING:
                 opaqueToolBar = opaqueStatusBar && PreferenceUtil.getInstance(this).opaqueToolbarNowPlaying();
-                if (lastFooterColor != -1) {
-                    animateColorChange(lastFooterColor);
-                }
+                setUpPlayerStatusBarElevation();
+                animateColorChange(lastFooterColor);
                 if (opaqueStatusBar) {
                     if (opaqueToolBar) {
                         alignAlbumArtToToolbar();
@@ -720,6 +720,16 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
         playerToolbar.setOnMenuItemClickListener(this);
     }
 
+    private void setUpPlayerStatusBarElevation() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            if (opaqueToolBar) {
+                playerStatusbar.setElevation(getResources().getDimensionPixelSize(R.dimen.toolbar_elevation));
+            } else {
+                playerStatusbar.setElevation(0);
+            }
+        }
+    }
+
     private void updatePlayerMenu() {
         boolean isFavorite = MusicUtil.isFavorite(this, song);
         playerToolbar.getMenu().findItem(R.id.action_toggle_favorite)