[Android] Use the new playlist icon

[Alexandre Perraud]

vlc-android | branch: master | Alexandre Perraud <4leyx4ndre at gmail.com> | Wed Feb 24 18:38:57 2016 +0100| [93a7ce597ad3f52107e64da709ef41dbf6a2ca9c] | committer: Alexandre Perraud

Use the new playlist icon

> https://code.videolan.org/videolan/vlc-android/commit/93a7ce597ad3f52107e64da709ef41dbf6a2ca9c
---

 vlc-android/res/layout-v16/player_action_bar.xml                    | 2 +-
 vlc-android/res/layout/player_action_bar.xml                        | 2 +-
 vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/vlc-android/res/layout-v16/player_action_bar.xml b/vlc-android/res/layout-v16/player_action_bar.xml
index f73e549..09173c9 100644
--- a/vlc-android/res/layout-v16/player_action_bar.xml
+++ b/vlc-android/res/layout-v16/player_action_bar.xml
@@ -26,7 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:src="@drawable/ic_playlist_video"
+        android:src="@drawable/ic_playlist_circle"
         android:focusable="true"
         android:visibility="gone"/>
 </RelativeLayout>
diff --git a/vlc-android/res/layout/player_action_bar.xml b/vlc-android/res/layout/player_action_bar.xml
index 072a73c..039ca66 100644
--- a/vlc-android/res/layout/player_action_bar.xml
+++ b/vlc-android/res/layout/player_action_bar.xml
@@ -38,7 +38,7 @@
         android:id="@+id/playlist_toggle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_playlist_video"
+        android:src="@drawable/ic_playlist_circle"
         android:focusable="true"
         android:visibility="gone"/>
 </LinearLayout>
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index 85b16b9..a2cd31e 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -2504,10 +2504,10 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
                     mRewind.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
                 if (mForward != null)
                     mForward.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
+                mSize.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
                 if (mMenuIdx >= 0 && mNavMenu != null)
                     mNavMenu.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
-            } else
-                mSize.setVisibility(View.INVISIBLE);
+            }
             if (mPresentation != null) {
                 mOverlayBackground.startAnimation(AnimationUtils.loadAnimation(this, android.R.anim.fade_out));
                 mOverlayBackground.setVisibility(View.INVISIBLE);
@@ -2523,6 +2523,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
                 mRewind.setVisibility(View.INVISIBLE);
             if (mForward != null)
                 mForward.setVisibility(View.INVISIBLE);
+            mSize.setVisibility(View.INVISIBLE);
             if (mMenuIdx >= 0 && mNavMenu != null)
                 mNavMenu.setVisibility(View.INVISIBLE);
             mShowing = false;