From 6c9eba5abf3aa9d25878d13483802ce051bf7402 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Fri, 21 Aug 2015 01:06:27 +0200 Subject: [PATCH] Restore some API 10 compatibility. --- .../hughes/android/dictionary/DictionaryActivity.java | 9 +++++---- .../hughes/android/dictionary/DictionaryApplication.java | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java index f932fbc..62e3a0a 100644 --- a/src/com/hughes/android/dictionary/DictionaryActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryActivity.java @@ -65,6 +65,7 @@ import android.widget.TextView; import android.widget.TextView.BufferType; import android.widget.Toast; +import android.support.v4.view.MenuItemCompat; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; import android.support.v7.widget.SearchView; @@ -795,7 +796,7 @@ public class DictionaryActivity extends ActionBarActivity { // Next word. nextWordMenuItem = menu.add(getString(R.string.nextWord)) .setIcon(R.drawable.arrow_down_float); - nextWordMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + MenuItemCompat.setShowAsAction(nextWordMenuItem, MenuItem.SHOW_AS_ACTION_IF_ROOM); nextWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { @@ -807,7 +808,7 @@ public class DictionaryActivity extends ActionBarActivity { // Previous word. previousWordMenuItem = menu.add(getString(R.string.previousWord)) .setIcon(R.drawable.arrow_up_float); - previousWordMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + MenuItemCompat.setShowAsAction(previousWordMenuItem, MenuItem.SHOW_AS_ACTION_IF_ROOM); previousWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { @@ -821,7 +822,7 @@ public class DictionaryActivity extends ActionBarActivity { { final MenuItem dictionaryManager = menu.add(getString(R.string.dictionaryManager)); - dictionaryManager.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + MenuItemCompat.setShowAsAction(dictionaryManager, MenuItem.SHOW_AS_ACTION_NEVER); dictionaryManager.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { startActivity(DictionaryManagerActivity.getLaunchIntent()); @@ -833,7 +834,7 @@ public class DictionaryActivity extends ActionBarActivity { { final MenuItem aboutDictionary = menu.add(getString(R.string.aboutDictionary)); - aboutDictionary.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + MenuItemCompat.setShowAsAction(aboutDictionary, MenuItem.SHOW_AS_ACTION_NEVER); aboutDictionary.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { final Context context = getListView().getContext(); diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java index 90027a0..ae2a7c2 100644 --- a/src/com/hughes/android/dictionary/DictionaryApplication.java +++ b/src/com/hughes/android/dictionary/DictionaryApplication.java @@ -29,6 +29,7 @@ import android.widget.Button; import android.widget.ImageButton; import android.widget.ImageView.ScaleType; +import android.support.v4.view.MenuItemCompat; import android.view.Menu; import android.view.MenuItem; import android.view.MenuItem.OnMenuItemClickListener; @@ -311,7 +312,7 @@ public class DictionaryApplication extends Application { public void onCreateGlobalOptionsMenu( final Context context, final Menu menu) { final MenuItem about = menu.add(getString(R.string.about)); - about.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + MenuItemCompat.setShowAsAction(about, MenuItem.SHOW_AS_ACTION_NEVER); about.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { final Intent intent = new Intent().setClassName(AboutActivity.class @@ -322,7 +323,7 @@ public class DictionaryApplication extends Application { }); final MenuItem help = menu.add(getString(R.string.help)); - help.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + MenuItemCompat.setShowAsAction(help, MenuItem.SHOW_AS_ACTION_NEVER); help.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { context.startActivity(HtmlDisplayActivity.getHelpLaunchIntent()); @@ -331,7 +332,7 @@ public class DictionaryApplication extends Application { }); final MenuItem preferences = menu.add(getString(R.string.settings)); - preferences.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + MenuItemCompat.setShowAsAction(preferences, MenuItem.SHOW_AS_ACTION_NEVER); preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { PreferenceActivity.prefsMightHaveChanged = true; @@ -343,7 +344,7 @@ public class DictionaryApplication extends Application { }); final MenuItem reportIssue = menu.add(getString(R.string.reportIssue)); - reportIssue.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + MenuItemCompat.setShowAsAction(reportIssue, MenuItem.SHOW_AS_ACTION_NEVER); reportIssue.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { final Intent intent = new Intent(Intent.ACTION_VIEW); -- 2.43.0