aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/src/main/java/org/connectbot/ConsoleActivity.java7
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_copy.pngbin0 -> 203 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_paste.pngbin0 -> 227 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_copy.pngbin0 -> 134 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_paste.pngbin0 -> 157 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_copy.pngbin0 -> 188 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_paste.pngbin0 -> 244 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_copy.pngbin0 -> 266 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_paste.pngbin0 -> 340 bytes
-rw-r--r--app/src/main/res/drawable-xxxhdpi/ic_action_copy.pngbin0 -> 329 bytes
-rw-r--r--app/src/main/res/drawable-xxxhdpi/ic_action_paste.pngbin0 -> 460 bytes
11 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 6a6aa32..4051a45 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;
@@ -915,7 +916,8 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
copy = menu.add(R.string.console_menu_copy);
if (hardKeyboard)
copy.setAlphabeticShortcut('c');
- 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) {
@@ -928,7 +930,8 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
paste = menu.add(R.string.console_menu_paste);
if (hardKeyboard)
paste.setAlphabeticShortcut('v');
- paste.setIcon(android.R.drawable.ic_menu_edit);
+ MenuItemCompat.setShowAsAction(paste, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+ paste.setIcon(R.drawable.ic_action_paste);
paste.setEnabled(clipboard.hasText() && sessionOpen);
paste.setOnMenuItemClickListener(new OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
diff --git a/app/src/main/res/drawable-hdpi/ic_action_copy.png b/app/src/main/res/drawable-hdpi/ic_action_copy.png
new file mode 100644
index 0000000..70eb073
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_copy.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_paste.png b/app/src/main/res/drawable-hdpi/ic_action_paste.png
new file mode 100644
index 0000000..a704a19
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_paste.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_copy.png b/app/src/main/res/drawable-mdpi/ic_action_copy.png
new file mode 100644
index 0000000..80c0695
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_copy.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_paste.png b/app/src/main/res/drawable-mdpi/ic_action_paste.png
new file mode 100644
index 0000000..40d0520
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_paste.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_copy.png b/app/src/main/res/drawable-xhdpi/ic_action_copy.png
new file mode 100644
index 0000000..537fd4e
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_copy.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_paste.png b/app/src/main/res/drawable-xhdpi/ic_action_paste.png
new file mode 100644
index 0000000..8015d55
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_paste.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_copy.png b/app/src/main/res/drawable-xxhdpi/ic_action_copy.png
new file mode 100644
index 0000000..9dff893
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_copy.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_paste.png b/app/src/main/res/drawable-xxhdpi/ic_action_paste.png
new file mode 100644
index 0000000..3b6283f
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_paste.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_copy.png b/app/src/main/res/drawable-xxxhdpi/ic_action_copy.png
new file mode 100644
index 0000000..4ddee9e
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_action_copy.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_paste.png b/app/src/main/res/drawable-xxxhdpi/ic_action_paste.png
new file mode 100644
index 0000000..42e5cfb
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_action_paste.png
Binary files differ