[Android] UI : Change icon name stop to close

[Alexandre Perraud]

vlc-ports/android | branch: master | Alexandre Perraud <4leyx4ndre at gmail.com> | Tue Jan 27 15:49:25 2015 +0100| [0e2991fd89f4993bd6a1d0c221fe0cc2fbbf4e2e] | committer: Alexandre Perraud

UI : Change icon name stop to close

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

 .../{ic_stop_normal_w.png => ic_close_normal_w.png}             |  Bin 278 -> 278 bytes
 .../{ic_stop_pressed_w.png => ic_close_pressed_w.png}           |  Bin 1714 -> 1714 bytes
 vlc-android/res/drawable-hdpi/ic_stop_normal.png                |  Bin 279 -> 0 bytes
 vlc-android/res/drawable-hdpi/ic_stop_pressed.png               |  Bin 1694 -> 0 bytes
 .../{ic_stop_normal_w.png => ic_close_normal_w.png}             |  Bin 202 -> 202 bytes
 .../{ic_stop_pressed_w.png => ic_close_pressed_w.png}           |  Bin 703 -> 703 bytes
 vlc-android/res/drawable-ldpi/ic_stop_normal.png                |  Bin 207 -> 0 bytes
 vlc-android/res/drawable-ldpi/ic_stop_pressed.png               |  Bin 714 -> 0 bytes
 .../{ic_stop_normal_w.png => ic_close_normal_w.png}             |  Bin 239 -> 239 bytes
 .../{ic_stop_pressed_w.png => ic_close_pressed_w.png}           |  Bin 960 -> 960 bytes
 vlc-android/res/drawable-mdpi/ic_stop_normal.png                |  Bin 241 -> 0 bytes
 vlc-android/res/drawable-mdpi/ic_stop_pressed.png               |  Bin 950 -> 0 bytes
 .../{ic_stop_normal_w.png => ic_close_normal_w.png}             |  Bin 359 -> 359 bytes
 .../{ic_stop_pressed_w.png => ic_close_pressed_w.png}           |  Bin 3252 -> 3252 bytes
 vlc-android/res/drawable-xhdpi/ic_stop_normal.png               |  Bin 360 -> 0 bytes
 vlc-android/res/drawable-xhdpi/ic_stop_pressed.png              |  Bin 3272 -> 0 bytes
 vlc-android/res/drawable/ic_close_w.xml                         |    7 +++++++
 vlc-android/res/drawable/ic_stop.xml                            |    7 -------
 vlc-android/res/drawable/ic_stop_w.xml                          |    7 -------
 vlc-android/res/layout/notification.xml                         |    2 +-
 vlc-android/res/layout/notification_expanded.xml                |    2 +-
 vlc-android/res/layout/vlcwidget.xml                            |    2 +-
 22 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/vlc-android/res/drawable-hdpi/ic_stop_normal_w.png b/vlc-android/res/drawable-hdpi/ic_close_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_stop_normal_w.png
rename to vlc-android/res/drawable-hdpi/ic_close_normal_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_stop_pressed_w.png b/vlc-android/res/drawable-hdpi/ic_close_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_stop_pressed_w.png
rename to vlc-android/res/drawable-hdpi/ic_close_pressed_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_stop_normal.png b/vlc-android/res/drawable-hdpi/ic_stop_normal.png
deleted file mode 100644
index 9766df5..0000000
Binary files a/vlc-android/res/drawable-hdpi/ic_stop_normal.png and /dev/null differ
diff --git a/vlc-android/res/drawable-hdpi/ic_stop_pressed.png b/vlc-android/res/drawable-hdpi/ic_stop_pressed.png
deleted file mode 100644
index fe77364..0000000
Binary files a/vlc-android/res/drawable-hdpi/ic_stop_pressed.png and /dev/null differ
diff --git a/vlc-android/res/drawable-ldpi/ic_stop_normal_w.png b/vlc-android/res/drawable-ldpi/ic_close_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_stop_normal_w.png
rename to vlc-android/res/drawable-ldpi/ic_close_normal_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_stop_pressed_w.png b/vlc-android/res/drawable-ldpi/ic_close_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_stop_pressed_w.png
rename to vlc-android/res/drawable-ldpi/ic_close_pressed_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_stop_normal.png b/vlc-android/res/drawable-ldpi/ic_stop_normal.png
deleted file mode 100644
index 13eb7cb..0000000
Binary files a/vlc-android/res/drawable-ldpi/ic_stop_normal.png and /dev/null differ
diff --git a/vlc-android/res/drawable-ldpi/ic_stop_pressed.png b/vlc-android/res/drawable-ldpi/ic_stop_pressed.png
deleted file mode 100644
index d47bbac..0000000
Binary files a/vlc-android/res/drawable-ldpi/ic_stop_pressed.png and /dev/null differ
diff --git a/vlc-android/res/drawable-mdpi/ic_stop_normal_w.png b/vlc-android/res/drawable-mdpi/ic_close_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_stop_normal_w.png
rename to vlc-android/res/drawable-mdpi/ic_close_normal_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_stop_pressed_w.png b/vlc-android/res/drawable-mdpi/ic_close_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_stop_pressed_w.png
rename to vlc-android/res/drawable-mdpi/ic_close_pressed_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_stop_normal.png b/vlc-android/res/drawable-mdpi/ic_stop_normal.png
deleted file mode 100644
index d8230b3..0000000
Binary files a/vlc-android/res/drawable-mdpi/ic_stop_normal.png and /dev/null differ
diff --git a/vlc-android/res/drawable-mdpi/ic_stop_pressed.png b/vlc-android/res/drawable-mdpi/ic_stop_pressed.png
deleted file mode 100644
index d2c1949..0000000
Binary files a/vlc-android/res/drawable-mdpi/ic_stop_pressed.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_stop_normal_w.png b/vlc-android/res/drawable-xhdpi/ic_close_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_stop_normal_w.png
rename to vlc-android/res/drawable-xhdpi/ic_close_normal_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_stop_pressed_w.png b/vlc-android/res/drawable-xhdpi/ic_close_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_stop_pressed_w.png
rename to vlc-android/res/drawable-xhdpi/ic_close_pressed_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_stop_normal.png b/vlc-android/res/drawable-xhdpi/ic_stop_normal.png
deleted file mode 100644
index 5d7ce7d..0000000
Binary files a/vlc-android/res/drawable-xhdpi/ic_stop_normal.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_stop_pressed.png b/vlc-android/res/drawable-xhdpi/ic_stop_pressed.png
deleted file mode 100644
index d0777a4..0000000
Binary files a/vlc-android/res/drawable-xhdpi/ic_stop_pressed.png and /dev/null differ
diff --git a/vlc-android/res/drawable/ic_close_w.xml b/vlc-android/res/drawable/ic_close_w.xml
new file mode 100644
index 0000000..dc59c8a
--- /dev/null
+++ b/vlc-android/res/drawable/ic_close_w.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_close_normal_w" android:state_focused="true" android:state_pressed="false"/>
+    <item android:drawable="@drawable/ic_close_pressed_w" android:state_focused="true" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_close_pressed_w" android:state_focused="false" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_close_normal_w"/>
+</selector>
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_stop.xml b/vlc-android/res/drawable/ic_stop.xml
deleted file mode 100644
index 6544cf2..0000000
--- a/vlc-android/res/drawable/ic_stop.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_stop_normal" android:state_focused="true" android:state_pressed="false"/>
-    <item android:drawable="@drawable/ic_stop_pressed" android:state_focused="true" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_stop_pressed" android:state_focused="false" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_stop_normal"/>
-</selector>
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_stop_w.xml b/vlc-android/res/drawable/ic_stop_w.xml
deleted file mode 100644
index 1690523..0000000
--- a/vlc-android/res/drawable/ic_stop_w.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_stop_normal_w" android:state_focused="true" android:state_pressed="false"/>
-    <item android:drawable="@drawable/ic_stop_pressed_w" android:state_focused="true" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_stop_pressed_w" android:state_focused="false" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_stop_normal_w"/>
-</selector>
\ No newline at end of file
diff --git a/vlc-android/res/layout/notification.xml b/vlc-android/res/layout/notification.xml
index 025d0f7..2c78f8b 100644
--- a/vlc-android/res/layout/notification.xml
+++ b/vlc-android/res/layout/notification.xml
@@ -70,6 +70,6 @@
         android:background="#00ffffff"
         android:clickable="true"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_stop_w" />
+        android:src="@drawable/ic_close_w" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/notification_expanded.xml b/vlc-android/res/layout/notification_expanded.xml
index 19faccd..41f64b9 100644
--- a/vlc-android/res/layout/notification_expanded.xml
+++ b/vlc-android/res/layout/notification_expanded.xml
@@ -61,7 +61,7 @@
         android:background="#00ffffff"
         android:clickable="true"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_stop_w" />
+        android:src="@drawable/ic_close_w" />
 
     <LinearLayout
         android:id="@+id/buttons"
diff --git a/vlc-android/res/layout/vlcwidget.xml b/vlc-android/res/layout/vlcwidget.xml
index 80ad5a9..6087bc8 100644
--- a/vlc-android/res/layout/vlcwidget.xml
+++ b/vlc-android/res/layout/vlcwidget.xml
@@ -87,7 +87,7 @@
                     android:background="#00ffffff"
                     android:clickable="true"
                     android:scaleType="fitXY"
-                    android:src="@drawable/ic_stop_w" />
+                    android:src="@drawable/ic_close_w" />
 
                 <ImageButton
                     android:id="@+id/forward"