diff options
| author | Andrew Dolgov <[email protected]> | 2011-11-24 17:57:44 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-11-24 17:57:44 +0300 |
| commit | 3cc0cb84104bb3d69ab276fe81a1ce42ec31cc4e (patch) | |
| tree | 301de972453456e4a4729a6d44b60b51467d72a3 /res/menu | |
| parent | 7ad712cb413824b1caae4327e8cc2f691e29d888 (diff) | |
various layout tweaks
fix logout action
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/login_menu.xml | 15 | ||||
| -rw-r--r-- | res/menu/main_menu.xml | 19 |
2 files changed, 14 insertions, 20 deletions
diff --git a/res/menu/login_menu.xml b/res/menu/login_menu.xml deleted file mode 100644 index 0c244247..00000000 --- a/res/menu/login_menu.xml +++ /dev/null @@ -1,15 +0,0 @@ - - <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:id="@+id/preferences" - android:icon="@android:drawable/ic_menu_preferences" - android:title="@string/preferences" - android:showAsAction="ifRoom|withText" - /> - - <item android:id="@+id/login" - android:icon="@android:drawable/ic_menu_rotate" - android:title="@string/login_login" - android:showAsAction="ifRoom|withText" - /> - - </menu> diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index a4dcb9f3..57b6a65d 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -7,17 +7,20 @@ android:title="@string/login" android:showAsAction="ifRoom|withText"/> - <item android:id="@+id/logout" - android:visible="false" - android:title="@string/logout" - android:showAsAction=""/> - + <item android:id="@+id/show_feeds" android:visible="false" android:icon="@android:drawable/ic_menu_rotate" android:title="@string/menu_all_feeds" android:showAsAction=""/> + <item android:id="@+id/close_article" + android:visible="false" + android:icon="@android:drawable/ic_menu_close_clear_cancel" + android:title="@string/close_article" + android:showAsAction="ifRoom|withText"/> + + <item android:id="@+id/update" android:visible="false" android:icon="@android:drawable/ic_menu_rotate" @@ -28,4 +31,10 @@ android:icon="@android:drawable/ic_menu_preferences" android:title="@string/preferences" android:showAsAction="ifRoom|withText"/> + + <item android:id="@+id/logout" + android:visible="false" + android:title="@string/logout" + android:showAsAction=""/> + </menu> |