[Android] UI Use the new trash icon

[Alexandre Perraud]

vlc-ports/android | branch: master | Alexandre Perraud <4leyx4ndre at gmail.com> | Mon Jan 19 16:54:27 2015 +0100| [7849d6b076949fe08d5a6374657f890dbf15a678] | committer: Geoffrey Métais

UI Use the new trash icon

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=7849d6b076949fe08d5a6374657f890dbf15a678
---

 vlc-android/res/layout/mrl_item.xml                  |   14 +++++++-------
 vlc-android/res/menu-v13/media_library.xml           |    2 +-
 vlc-android/res/menu-v7/media_library.xml            |    2 +-
 vlc-android/src/org/videolan/vlc/gui/MRLAdapter.java |    5 +++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/vlc-android/res/layout/mrl_item.xml b/vlc-android/res/layout/mrl_item.xml
index ea6f39c..2bfad0a 100644
--- a/vlc-android/res/layout/mrl_item.xml
+++ b/vlc-android/res/layout/mrl_item.xml
@@ -8,14 +8,14 @@
         android:paddingLeft="10dp"
         android:clickable="true"
         android:layout_toLeftOf="@+id/mrl_item_delete"
-        android:gravity="center_vertical"
-        android:layout_alignBottom="@+id/mrl_item_delete"
-        android:layout_alignTop="@+id/mrl_item_delete"/>
-    <ImageButton
+        android:gravity="center_vertical"/>
+    <ImageView
         android:id="@+id/mrl_item_delete"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
+        android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:src="@drawable/ic_stat_vlc"/>
+        android:layout_centerInParent="true"
+        android:src="@drawable/ic_trash_small_normal"
+        android:clickable="true"
+        android:paddingRight="5dp"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/vlc-android/res/menu-v13/media_library.xml b/vlc-android/res/menu-v13/media_library.xml
index 0a2aa40..95edd9f 100644
--- a/vlc-android/res/menu-v13/media_library.xml
+++ b/vlc-android/res/menu-v13/media_library.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/ml_menu_clean"
-        android:icon="@drawable/ic_stat_vlc"
+        android:icon="@drawable/ic_trash_normal_w"
         android:title="@string/clear_history"
         android:nextFocusDown="@id/ml_menu_search"
         android:visible="false"
diff --git a/vlc-android/res/menu-v7/media_library.xml b/vlc-android/res/menu-v7/media_library.xml
index ebf2a49..f70419a 100644
--- a/vlc-android/res/menu-v7/media_library.xml
+++ b/vlc-android/res/menu-v7/media_library.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/ml_menu_clean"
-        android:icon="@drawable/ic_stat_vlc"
+        android:icon="@drawable/ic_trash_normal_w"
         android:title="@string/clear_history"
         android:nextFocusDown="@id/ml_menu_search"
         android:visible="false"
diff --git a/vlc-android/src/org/videolan/vlc/gui/MRLAdapter.java b/vlc-android/src/org/videolan/vlc/gui/MRLAdapter.java
index 3a1bcc3..2a94a07 100644
--- a/vlc-android/src/org/videolan/vlc/gui/MRLAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/MRLAdapter.java
@@ -24,6 +24,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.videolan.vlc.MediaDatabase;
@@ -36,12 +37,12 @@ public class MRLAdapter extends RecyclerView.Adapter<MRLAdapter.ViewHolder> {
     private ArrayList<String> mDataset;
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public TextView uriTv;
-        public ImageButton deleteButton;
+        public ImageView deleteButton;
 
         public ViewHolder(View v) {
             super(v);
             uriTv = (TextView) v.findViewById(R.id.mrl_item_uri);
-            deleteButton = (ImageButton) v.findViewById(R.id.mrl_item_delete);
+            deleteButton = (ImageView) v.findViewById(R.id.mrl_item_delete);
         }
     }