diff options
Diffstat (limited to 'org.fox.ttrss/src')
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/menu/main_menu.xml | 27 |
2 files changed, 20 insertions, 11 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 646f5f34..ab7c95e8 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -723,9 +723,9 @@ public class OnlineActivity extends CommonActivity { openUnlockUrl(); } return true; - case R.id.logout: + /*case R.id.logout: logout(); - return true; + return true;*/ case R.id.login: login(); return true; diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml index 3ebfade5..f3715010 100755 --- a/org.fox.ttrss/src/main/res/menu/main_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/main_menu.xml @@ -25,12 +25,12 @@ android:icon="@drawable/ic_refresh" app:showAsAction="" android:title="@string/update_feeds"/> --> - <item + <!-- <item android:orderInCategory="900" android:id="@+id/logout" android:icon="@drawable/ic_logout" app:showAsAction="" - android:title="@string/logout"/> + android:title="@string/logout"/> --> </group> <group android:id="@+id/menu_group_headlines" > <!-- <item @@ -113,14 +113,15 @@ android:id="@+id/donate" app:showAsAction="" android:title="@string/trial_purchase"/> - </group> - <item - android:orderInCategory="999" - android:id="@+id/preferences" - android:icon="@drawable/ic_settings" - app:showAsAction="" - android:title="@string/preferences"/> + <item + android:orderInCategory="999" + android:id="@+id/preferences" + android:icon="@drawable/ic_settings" + app:showAsAction="" + android:title="@string/preferences"/> + + </group> <group android:id="@+id/menu_group_logged_out" > <item @@ -128,6 +129,14 @@ android:icon="@drawable/ic_login" app:showAsAction="ifRoom" android:title="@string/login_login"/> + + <item + android:orderInCategory="999" + android:id="@+id/preferences" + android:icon="@drawable/ic_settings" + app:showAsAction="ifRoom" + android:title="@string/preferences"/> + </group> </menu> |