From 116c65df90a4307a8460b6fe49dcf24b9eaffc26 Mon Sep 17 00:00:00 2001 From: Morgan Gangwere Date: Wed, 2 Apr 2014 02:22:16 -0600 Subject: [PATCH] Famangled ABS into letting me show the menu always. ABS now always thinks there's no hardware button. I also broke something somehow last commit (I didn't stash right) --- application/res/menu/conversations.xml | 16 ++++++++-------- application/res/xml/preferences.xml | 4 ---- .../internal/view/menu/ActionMenuPresenter.java | 8 ++------ 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/application/res/menu/conversations.xml b/application/res/menu/conversations.xml index 8d489f0..8b0927f 100644 --- a/application/res/menu/conversations.xml +++ b/application/res/menu/conversations.xml @@ -24,12 +24,17 @@ along with Yaaic. If not, see . android:id="@+id/join" android:title="@string/join_channel" android:icon="@drawable/actionbar_add" - android:showAsAction="always|withText" /> + android:showAsAction="never" /> + + android:showAsAction="ifRoom|withText" /> . android:title="@string/disconnect" android:icon="@android:drawable/ic_menu_revert" android:showAsAction="never" /> - + \ No newline at end of file diff --git a/application/res/xml/preferences.xml b/application/res/xml/preferences.xml index 6c5e1ca..8975291 100644 --- a/application/res/xml/preferences.xml +++ b/application/res/xml/preferences.xml @@ -23,7 +23,6 @@ along with Yaaic. If not, see . . android:title="@string/settings_ignore_motd_title" /> . . android:title="@string/settings_led_highlight_title" /> = Build.VERSION_CODES.HONEYCOMB); - } else { - return !HasPermanentMenuKey.get(context); - } + return true; } private static class HasPermanentMenuKey { public static boolean get(Context context) { - return ViewConfiguration.get(context).hasPermanentMenuKey(); + return false; } }