summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/menu/main.xml46
-rw-r--r--res/xml/searchable.xml7
2 files changed, 40 insertions, 13 deletions
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 9232a95aa..0b1b3cbcb 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -1,17 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/all_feed_refresh" android:title="@string/refresh_label" android:icon="?attr/navigation_refresh" android:showAsAction="ifRoom|collapseActionView">
- </item><item
+ <item
+ android:id="@+id/all_feed_refresh"
+ android:title="@string/refresh_label"
+ android:icon="?attr/navigation_refresh"
+ android:showAsAction="ifRoom|collapseActionView">
+ </item>
+ <item
android:id="@+id/add_feed"
android:title="@string/add_feed_label"
android:icon="?attr/content_new"
android:showAsAction="ifRoom|collapseActionView">
</item>
-
-
-
- <item android:id="@id/search_item" android:icon="?attr/action_search" android:title="@string/search_label" android:showAsAction="ifRoom|collapseActionView"></item><item android:id="@+id/show_player" android:title="@string/show_player_label" android:icon="@drawable/av_play" android:showAsAction="collapseActionView"></item><item android:id="@+id/show_playback_history" android:title="@string/playback_history_label" android:showAsAction="collapseActionView"></item><item android:id="@+id/show_downloads" android:title="@string/downloads_label" android:icon="@drawable/av_download" android:showAsAction="collapseActionView">
- </item><item android:id="@+id/show_preferences" android:title="@string/settings_label" android:icon="?attr/action_settings" android:showAsAction="collapseActionView"></item>
-
-
+
+
+ <item
+ android:id="@id/search_item"
+ android:icon="?attr/action_search"
+ android:title="@string/search_label"
+ android:showAsAction="ifRoom|collapseActionView"
+ android:actionViewClass="android.support.v7.widget.SearchView"/>
+ <item
+ android:id="@+id/show_player"
+ android:title="@string/show_player_label"
+ android:icon="@drawable/av_play"
+ android:showAsAction="collapseActionView"/>
+ <item
+ android:id="@+id/show_playback_history"
+ android:title="@string/playback_history_label"
+ android:showAsAction="collapseActionView"/>
+ <item
+ android:id="@+id/show_downloads"
+ android:title="@string/downloads_label"
+ android:icon="@drawable/av_download"
+ android:showAsAction="collapseActionView">
+ </item>
+ <item
+ android:id="@+id/show_preferences"
+ android:title="@string/settings_label"
+ android:icon="?attr/action_settings"
+ android:showAsAction="collapseActionView"/>
+
+
</menu>
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index 522bd9be5..ee73aca8d 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<searchable xmlns:android="http://schemas.android.com/apk/res/android" android:hint="@string/search_hint" android:label="@string/app_name" android:icon="@drawable/ic_launcher">
-
-
-</searchable> \ No newline at end of file
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+ android:hint="@string/search_hint"
+ android:label="@string/app_name"/> \ No newline at end of file