[Android] UI : Rename some icons into common naming conventions

[Alexandre Perraud]

vlc-ports/android | branch: master | Alexandre Perraud <4leyx4ndre at gmail.com> | Tue Mar  4 11:58:01 2014 +0100| [169b940ad5a924460de17159d01385baef8068d3] | committer: Adrien Maglo

UI : Rename some icons into common naming conventions

Signed-off-by: Adrien Maglo <magsoft at videolan.org>

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

 vlc-android/res/drawable-hdpi/{audio.png => ic_menu_audio.png} |  Bin 576 -> 576 bytes
 .../res/drawable-hdpi/{folder.png => ic_menu_folder.png}       |  Bin 339 -> 339 bytes
 .../res/drawable-hdpi/{time.png => ic_menu_history.png}        |  Bin 697 -> 697 bytes
 vlc-android/res/drawable-hdpi/{video.png => ic_menu_video.png} |  Bin 695 -> 695 bytes
 vlc-android/res/drawable-ldpi/{audio.png => ic_menu_audio.png} |  Bin 327 -> 327 bytes
 .../res/drawable-ldpi/{folder.png => ic_menu_folder.png}       |  Bin 219 -> 219 bytes
 .../res/drawable-ldpi/{time.png => ic_menu_history.png}        |  Bin 372 -> 372 bytes
 vlc-android/res/drawable-ldpi/{video.png => ic_menu_video.png} |  Bin 381 -> 381 bytes
 vlc-android/res/drawable-mdpi/{audio.png => ic_menu_audio.png} |  Bin 402 -> 402 bytes
 .../res/drawable-mdpi/{folder.png => ic_menu_folder.png}       |  Bin 259 -> 259 bytes
 .../res/drawable-mdpi/{time.png => ic_menu_history.png}        |  Bin 497 -> 497 bytes
 vlc-android/res/drawable-mdpi/{video.png => ic_menu_video.png} |  Bin 501 -> 501 bytes
 .../res/drawable-xhdpi/{audio.png => ic_menu_audio.png}        |  Bin 753 -> 753 bytes
 .../res/drawable-xhdpi/{folder.png => ic_menu_folder.png}      |  Bin 501 -> 501 bytes
 .../res/drawable-xhdpi/{time.png => ic_menu_history.png}       |  Bin 876 -> 876 bytes
 .../res/drawable-xhdpi/{video.png => ic_menu_video.png}        |  Bin 919 -> 919 bytes
 vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java     |    2 +-
 vlc-android/src/org/videolan/vlc/gui/SidebarAdapter.java       |    8 ++++----
 18 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vlc-android/res/drawable-hdpi/audio.png b/vlc-android/res/drawable-hdpi/ic_menu_audio.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/audio.png
rename to vlc-android/res/drawable-hdpi/ic_menu_audio.png
diff --git a/vlc-android/res/drawable-hdpi/folder.png b/vlc-android/res/drawable-hdpi/ic_menu_folder.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/folder.png
rename to vlc-android/res/drawable-hdpi/ic_menu_folder.png
diff --git a/vlc-android/res/drawable-hdpi/time.png b/vlc-android/res/drawable-hdpi/ic_menu_history.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/time.png
rename to vlc-android/res/drawable-hdpi/ic_menu_history.png
diff --git a/vlc-android/res/drawable-hdpi/video.png b/vlc-android/res/drawable-hdpi/ic_menu_video.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/video.png
rename to vlc-android/res/drawable-hdpi/ic_menu_video.png
diff --git a/vlc-android/res/drawable-ldpi/audio.png b/vlc-android/res/drawable-ldpi/ic_menu_audio.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/audio.png
rename to vlc-android/res/drawable-ldpi/ic_menu_audio.png
diff --git a/vlc-android/res/drawable-ldpi/folder.png b/vlc-android/res/drawable-ldpi/ic_menu_folder.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/folder.png
rename to vlc-android/res/drawable-ldpi/ic_menu_folder.png
diff --git a/vlc-android/res/drawable-ldpi/time.png b/vlc-android/res/drawable-ldpi/ic_menu_history.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/time.png
rename to vlc-android/res/drawable-ldpi/ic_menu_history.png
diff --git a/vlc-android/res/drawable-ldpi/video.png b/vlc-android/res/drawable-ldpi/ic_menu_video.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/video.png
rename to vlc-android/res/drawable-ldpi/ic_menu_video.png
diff --git a/vlc-android/res/drawable-mdpi/audio.png b/vlc-android/res/drawable-mdpi/ic_menu_audio.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/audio.png
rename to vlc-android/res/drawable-mdpi/ic_menu_audio.png
diff --git a/vlc-android/res/drawable-mdpi/folder.png b/vlc-android/res/drawable-mdpi/ic_menu_folder.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/folder.png
rename to vlc-android/res/drawable-mdpi/ic_menu_folder.png
diff --git a/vlc-android/res/drawable-mdpi/time.png b/vlc-android/res/drawable-mdpi/ic_menu_history.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/time.png
rename to vlc-android/res/drawable-mdpi/ic_menu_history.png
diff --git a/vlc-android/res/drawable-mdpi/video.png b/vlc-android/res/drawable-mdpi/ic_menu_video.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/video.png
rename to vlc-android/res/drawable-mdpi/ic_menu_video.png
diff --git a/vlc-android/res/drawable-xhdpi/audio.png b/vlc-android/res/drawable-xhdpi/ic_menu_audio.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/audio.png
rename to vlc-android/res/drawable-xhdpi/ic_menu_audio.png
diff --git a/vlc-android/res/drawable-xhdpi/folder.png b/vlc-android/res/drawable-xhdpi/ic_menu_folder.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/folder.png
rename to vlc-android/res/drawable-xhdpi/ic_menu_folder.png
diff --git a/vlc-android/res/drawable-xhdpi/time.png b/vlc-android/res/drawable-xhdpi/ic_menu_history.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/time.png
rename to vlc-android/res/drawable-xhdpi/ic_menu_history.png
diff --git a/vlc-android/res/drawable-xhdpi/video.png b/vlc-android/res/drawable-xhdpi/ic_menu_video.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/video.png
rename to vlc-android/res/drawable-xhdpi/ic_menu_video.png
diff --git a/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java b/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java
index 0b1cee0..c1da3a1 100644
--- a/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java
@@ -326,7 +326,7 @@ public class DirectoryAdapter extends BaseAdapter {
         if(selectedNode.isFile())
             holder.icon.setImageResource(R.drawable.icon);
         else
-            holder.icon.setImageResource(R.drawable.folder);
+            holder.icon.setImageResource(R.drawable.ic_menu_folder);
 
         return v;
     }
diff --git a/vlc-android/src/org/videolan/vlc/gui/SidebarAdapter.java b/vlc-android/src/org/videolan/vlc/gui/SidebarAdapter.java
index ffa3fd1..e65f205 100644
--- a/vlc-android/src/org/videolan/vlc/gui/SidebarAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/SidebarAdapter.java
@@ -67,10 +67,10 @@ public class SidebarAdapter extends BaseAdapter {
 
     static {
         SidebarEntry entries2[] = {
-            new SidebarEntry( "video", R.string.video, R.drawable.video ),
-            new SidebarEntry( "audio", R.string.audio, R.drawable.audio ),
-            new SidebarEntry( "directories", R.string.directories, R.drawable.folder ),
-            new SidebarEntry( "history", R.string.history, R.drawable.time ),
+            new SidebarEntry( "video", R.string.video, R.drawable.ic_menu_video ),
+            new SidebarEntry( "audio", R.string.audio, R.drawable.ic_menu_audio ),
+            new SidebarEntry( "directories", R.string.directories, R.drawable.ic_menu_folder ),
+            new SidebarEntry( "history", R.string.history, R.drawable.ic_menu_history ),
             //new SidebarEntry( "bookmarks", R.string.bookmarks, R.drawable.ic_bookmarks ),
             //new SidebarEntry( "playlists", R.string.playlists, R.drawable.icon ),
         };