[Android] Show all action options

Geoffrey Métais git at videolan.org
Mon Jan 2 16:55:02 CET 2017


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Jan  2 16:54:41 2017 +0100| [cd53f80f6c278492903091323b3bb724eba8872a] | committer: Geoffrey Métais

Show all action options

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

 vlc-android/res/menu/action_mode_audio_browser.xml | 21 ++++++++++++++-------
 vlc-android/res/menu/action_mode_browser_file.xml  | 21 ++++++++++++++-------
 vlc-android/res/menu/action_mode_history.xml       | 12 ++++++++----
 vlc-android/res/menu/action_mode_video.xml         | 22 +++++++++++++++-------
 4 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/vlc-android/res/menu/action_mode_audio_browser.xml b/vlc-android/res/menu/action_mode_audio_browser.xml
index e1ee5db..d4b8b8f 100644
--- a/vlc-android/res/menu/action_mode_audio_browser.xml
+++ b/vlc-android/res/menu/action_mode_audio_browser.xml
@@ -1,31 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_mode_audio_info"
         android:title="@string/info"
-        android:icon="@drawable/ic_am_information_w"/>
+        android:icon="@drawable/ic_am_information_w"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_mode_audio_play"
         android:title="@string/play"
-        android:icon="@drawable/ic_play_w"/>
+        android:icon="@drawable/ic_play_w"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_mode_audio_append"
         android:title="@string/append"
-        android:icon="@drawable/ic_am_append_w"/>
+        android:icon="@drawable/ic_am_append_w"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_mode_audio_add_playlist"
         android:title="@string/add_to_playlist"
-        android:icon="@drawable/ic_am_addtoplaylist_w"/>
+        android:icon="@drawable/ic_am_addtoplaylist_w"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_mode_audio_delete"
         android:title="@string/delete"
         android:icon="@drawable/ic_trash_normal_w"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="always" />
     <group android:id="@+id/phone_only" >
         <item
             android:id="@+id/action_mode_audio_set_song"
             android:title="@string/set_song"
             android:icon="@drawable/ic_am_ringtone_w"
-            android:visible="false" />
+            android:visible="false"
+            app:showAsAction="always" />
     </group>
 </menu>
\ No newline at end of file
diff --git a/vlc-android/res/menu/action_mode_browser_file.xml b/vlc-android/res/menu/action_mode_browser_file.xml
index 010277e..68e1ca5 100644
--- a/vlc-android/res/menu/action_mode_browser_file.xml
+++ b/vlc-android/res/menu/action_mode_browser_file.xml
@@ -1,30 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_mode_file_info"
         android:title="@string/info"
         android:visible="false"
-        android:icon="@drawable/ic_am_information_w"/>
+        android:icon="@drawable/ic_am_information_w"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_mode_file_play"
         android:title="@string/play_all"
-        android:icon="@drawable/ic_play_w"/>
+        android:icon="@drawable/ic_play_w"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_mode_file_append"
         android:title="@string/append"
-        android:icon="@drawable/ic_am_append_w"/>
+        android:icon="@drawable/ic_am_append_w"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_mode_file_delete"
         android:title="@string/delete"
         android:visible="false"
-        android:icon="@drawable/ic_trash_normal_w"/>
+        android:icon="@drawable/ic_trash_normal_w"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_mode_file_add_playlist"
         android:title="@string/add_to_playlist"
-        android:icon="@drawable/ic_am_addtoplaylist_w"/>
+        android:icon="@drawable/ic_am_addtoplaylist_w"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_mode_file_subtitles_download"
         android:title="@string/download_subtitles"
         android:visible="false"
-        android:icon="@drawable/ic_am_downsub_w"/>
+        android:icon="@drawable/ic_am_downsub_w"
+        app:showAsAction="always"/>
 </menu>
\ No newline at end of file
diff --git a/vlc-android/res/menu/action_mode_history.xml b/vlc-android/res/menu/action_mode_history.xml
index 13eb48c..9d43ed7 100644
--- a/vlc-android/res/menu/action_mode_history.xml
+++ b/vlc-android/res/menu/action_mode_history.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_history_info"
         android:visible="false"
         android:title="@string/info"
-        android:icon="@drawable/ic_am_information_w"/>
+        android:icon="@drawable/ic_am_information_w"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_history_play"
         android:title="@string/play"
-        android:icon="@drawable/ic_play_w" />
+        android:icon="@drawable/ic_play_w"
+        app:showAsAction="always" />
     <item
         android:id="@+id/action_history_append"
         android:title="@string/append"
-        android:icon="@drawable/ic_am_append_w" />
+        android:icon="@drawable/ic_am_append_w"
+        app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/vlc-android/res/menu/action_mode_video.xml b/vlc-android/res/menu/action_mode_video.xml
index ee7ec95..fa34abf 100644
--- a/vlc-android/res/menu/action_mode_video.xml
+++ b/vlc-android/res/menu/action_mode_video.xml
@@ -1,29 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_video_info"
         android:visible="false"
         android:title="@string/info"
-        android:icon="@drawable/ic_am_information_w"/>
+        android:icon="@drawable/ic_am_information_w"
+        app:showAsAction="always" />
+
     <item
         android:id="@+id/action_video_play"
         android:title="@string/play"
-        android:icon="@drawable/ic_play_w" />
+        android:icon="@drawable/ic_play_w"
+        app:showAsAction="always" />
     <item
         android:id="@+id/action_video_append"
         android:title="@string/append"
-        android:icon="@drawable/ic_am_append_w" />
+        android:icon="@drawable/ic_am_append_w"
+        app:showAsAction="always" />
     <item
         android:id="@+id/action_video_play_audio"
         android:title="@string/play_as_audio"
-        android:icon="@drawable/ic_am_playasaudio_w"/>
+        android:icon="@drawable/ic_am_playasaudio_w"
+        app:showAsAction="always" />
     <item
         android:id="@+id/action_video_delete"
         android:title="@string/delete"
         android:icon="@drawable/ic_trash_normal_w"
-        android:visible="false"/>
+        android:visible="false"
+        app:showAsAction="always" />
     <item
         android:id="@+id/action_video_download_subtitles"
         android:title="@string/download_subtitles"
-        android:icon="@drawable/ic_am_downsub_w"/>
+        android:icon="@drawable/ic_am_downsub_w"
+        app:showAsAction="always" />
 </menu>
\ No newline at end of file



More information about the Android mailing list