diff options
| author | Kenny Root <kenny@the-b.org> | 2015-08-31 09:35:03 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-08-31 09:35:03 -0700 |
| commit | 5f9f8a3ce2c390ea4530635f9c260902fe217958 (patch) | |
| tree | 901c263a372c9858b1edae454e2559c3d063760c /app/src/main/java/org/connectbot/ConsoleActivity.java | |
| parent | b515b3f4a88ad9e53e1c9741014f08bedc127a64 (diff) | |
| parent | 597f29067a55b3b00c5d1dec43769c1763ed5e85 (diff) | |
| download | connectbot-5f9f8a3ce2c390ea4530635f9c260902fe217958.tar.gz connectbot-5f9f8a3ce2c390ea4530635f9c260902fe217958.tar.bz2 connectbot-5f9f8a3ce2c390ea4530635f9c260902fe217958.zip | |
Merge pull request #145 from alescdb/action-menu
Change menu copy and paste icons and add them to action menu (if room)
Diffstat (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java')
| -rw-r--r-- | app/src/main/java/org/connectbot/ConsoleActivity.java | 7 |
1 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) { |