diff options
| author | Size43 | 2015-06-03 12:36:04 +0200 |
|---|---|---|
| committer | Size43 | 2015-06-03 12:36:04 +0200 |
| commit | 0b5a12e523d90b3721d1b310283dff655dcccee5 (patch) | |
| tree | 3972b88a11f96c56a2f051ad7f67a1f3cf8b7952 /app/src/main/res/menu | |
| parent | Strings.xml (diff) | |
| parent | Error handling ArticleActivity (diff) | |
merge
Diffstat (limited to 'app/src/main/res/menu')
| -rwxr-xr-x | app/src/main/res/menu/global.xml | 5 | ||||
| -rwxr-xr-x | app/src/main/res/menu/home_screen.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/menu/menu_filter_settings.xml | 5 |
3 files changed, 14 insertions, 5 deletions
diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml new file mode 100755 index 0000000..fc41e98 --- /dev/null +++ b/app/src/main/res/menu/global.xml @@ -0,0 +1,5 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ <item android:id="@+id/action_settings" android:title="@string/action_settings"
+ android:orderInCategory="100" app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/menu/home_screen.xml b/app/src/main/res/menu/home_screen.xml new file mode 100755 index 0000000..cf4b03a --- /dev/null +++ b/app/src/main/res/menu/home_screen.xml @@ -0,0 +1,9 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:context="org.rssin.android.HomeScreenActivity">
+ <item android:id="@+id/action_example" android:title="@string/action_example"
+ app:showAsAction="withText|ifRoom" />
+ <item android:id="@+id/action_settings" android:title="@string/action_settings"
+ android:orderInCategory="100" app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/menu/menu_filter_settings.xml b/app/src/main/res/menu/menu_filter_settings.xml index 848c9df..655ee84 100644 --- a/app/src/main/res/menu/menu_filter_settings.xml +++ b/app/src/main/res/menu/menu_filter_settings.xml @@ -6,11 +6,6 @@ tools:context=".FilterSettingsActivity"> <item - android:id="@+id/filter_settings_action_feeds" - android:title="@string/filter_settings_action_feeds" - app:showAsAction="ifRoom" /> - - <item android:id="@+id/filter_settings_action_title" android:title="@string/filter_settings_action_title" app:showAsAction="ifRoom" /> |