diff options
| author | alescdb <alescdb@users.noreply.github.com> | 2015-08-24 21:29:47 +0200 |
|---|---|---|
| committer | alescdb <alescdb@users.noreply.github.com> | 2015-08-24 21:29:47 +0200 |
| commit | 184b6281c15e30a3048019600ad205716045fc25 (patch) | |
| tree | 793fc94a046c589ab071703efc8120e012bc0c89 /app/src/main/java/org/connectbot/ConsoleActivity.java | |
| parent | da4586e47d3afe65d43ef1faeab71ac5cc582e5c (diff) | |
| download | connectbot-184b6281c15e30a3048019600ad205716045fc25.tar.gz connectbot-184b6281c15e30a3048019600ad205716045fc25.tar.bz2 connectbot-184b6281c15e30a3048019600ad205716045fc25.zip | |
Using MenuItemCompat to resolve backward compatibility and lint warnings
Diffstat (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java')
| -rw-r--r-- | app/src/main/java/org/connectbot/ConsoleActivity.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index f134b72..72fd2fd 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -51,6 +51,7 @@ import android.preference.PreferenceManager; import android.support.annotation.Nullable; import android.support.v4.app.ActivityCompat; import android.support.design.widget.TabLayout; +import android.support.v4.view.MenuItemCompat; import android.support.v4.view.MotionEventCompat; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; @@ -711,10 +712,8 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne copy = menu.add(R.string.console_menu_copy); if (hardKeyboard) copy.setAlphabeticShortcut('c'); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - copy.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - } - copy.setIcon(android.R.drawable.ic_menu_set_as); + MenuItemCompat.setShowAsAction(copy, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); + copy.setIcon(R.drawable.ic_action_copy); copy.setEnabled(activeTerminal); copy.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { @@ -727,11 +726,8 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne paste = menu.add(R.string.console_menu_paste); if (hardKeyboard) paste.setAlphabeticShortcut('v'); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - paste.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - } + MenuItemCompat.setShowAsAction(paste, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); paste.setIcon(R.drawable.ic_action_paste); - paste.setIcon(android.R.drawable.ic_menu_edit); paste.setEnabled(clipboard.hasText() && sessionOpen); paste.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { |