use MenuItemCompat.setShowAsAction -- does not exist before Honeycomb

ddrown · Jul 18, 2012 · e32e836 · e32e836
1 parent 032f0b0
commit e32e836
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.classpath b/.classpath
@@ -4,6 +4,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="lib" path="libs/bugsense-trace-1-1.jar"/>
+	<classpathentry kind="lib" path="libs/android-support-v4.jar" />
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/build.xml b/build.xml
@@ -145,7 +145,7 @@
         <proguard configuration="proguard.flags" printusage="${out.dir}/proguard.usage">
             <injar path="${out.classes.absolute.dir}"/>
             <outjar path="${proguard.out.dir}"/>
-            <libraryjar path="${sdk.dir}/platforms/${target}/android.jar:libs/bugsense-trace-1-1.jar"/>
+            <libraryjar path="${sdk.dir}/platforms/${target}/android.jar:libs/bugsense-trace-1-1.jar:libs/android-support-v4.jar"/>
         </proguard>
     </target>
 

diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
diff --git a/src/org/woltage/irssiconnectbot/ConsoleActivity.java b/src/org/woltage/irssiconnectbot/ConsoleActivity.java
@@ -56,6 +56,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
+import android.support.v4.view.MenuItemCompat;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnKeyListener;
@@ -524,7 +525,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
         MenuItem ctrlKey = menu.add("Ctrl");
         ctrlKey.setEnabled(activeTerminal);
         ctrlKey.setIcon(R.drawable.button_ctrl);
-        ctrlKey.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        MenuItemCompat.setShowAsAction(ctrlKey, MenuItem.SHOW_AS_ACTION_IF_ROOM);
         ctrlKey.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem menuItem) {
@@ -543,7 +544,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
         MenuItem escKey = menu.add("Esc");
         escKey.setEnabled(activeTerminal);
         escKey.setIcon(R.drawable.button_esc);
-        escKey.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        MenuItemCompat.setShowAsAction(escKey, MenuItem.SHOW_AS_ACTION_IF_ROOM);
         escKey.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem menuItem) {
@@ -562,7 +563,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
         MenuItem symKey = menu.add("SYM");
         symKey.setEnabled(activeTerminal);
         symKey.setIcon(R.drawable.button_sym);
-        symKey.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        MenuItemCompat.setShowAsAction(symKey, MenuItem.SHOW_AS_ACTION_IF_ROOM);
         symKey.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem menuItem) {
@@ -580,7 +581,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
         MenuItem inputButton = menu.add("Input");
         inputButton.setEnabled(activeTerminal);
         inputButton.setIcon(R.drawable.button_input);
-        inputButton.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        MenuItemCompat.setShowAsAction(inputButton, MenuItem.SHOW_AS_ACTION_IF_ROOM);
         inputButton.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem menuItem) {
@@ -605,7 +606,7 @@ public void run() {
         MenuItem keyboard = menu.add("Show Keyboard");
         keyboard.setEnabled(activeTerminal);
         keyboard.setIcon(R.drawable.button_keyboard);
-        keyboard.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        MenuItemCompat.setShowAsAction(keyboard, MenuItem.SHOW_AS_ACTION_IF_ROOM);
         keyboard.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem menuItem) {