From ee5bef7749f88e8fdcafbf01bd1a9387cfe7435e Mon Sep 17 00:00:00 2001 From: alescdb Date: Sat, 22 Aug 2015 23:31:04 +0200 Subject: Change menu copy and paste icons and add them to action menu (if room) for AP11 and newer --- app/src/main/java/org/connectbot/ConsoleActivity.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 6f72783..32cd8e3 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -711,6 +711,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); copy.setEnabled(activeTerminal); copy.setOnMenuItemClickListener(new OnMenuItemClickListener() { @@ -724,6 +726,9 @@ 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); + paste.setIcon(R.drawable.ic_action_paste); paste.setIcon(android.R.drawable.ic_menu_edit); paste.setEnabled(clipboard.hasText() && sessionOpen); paste.setOnMenuItemClickListener(new OnMenuItemClickListener() { -- cgit v1.2.3 From da4586e47d3afe65d43ef1faeab71ac5cc582e5c Mon Sep 17 00:00:00 2001 From: alescdb Date: Sun, 23 Aug 2015 00:18:49 +0200 Subject: lint check --- app/src/main/java/org/connectbot/ConsoleActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 32cd8e3..f134b72 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -711,8 +711,9 @@ 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) + 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); copy.setEnabled(activeTerminal); copy.setOnMenuItemClickListener(new OnMenuItemClickListener() { @@ -726,8 +727,9 @@ 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) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { paste.setShowAsAction(MenuItem.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); -- cgit v1.2.3 From 184b6281c15e30a3048019600ad205716045fc25 Mon Sep 17 00:00:00 2001 From: alescdb Date: Mon, 24 Aug 2015 21:29:47 +0200 Subject: Using MenuItemCompat to resolve backward compatibility and lint warnings --- app/src/main/java/org/connectbot/ConsoleActivity.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') 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) { -- cgit v1.2.3