From ee1555b863d67286017aa8a6a99463b699c3fee9 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Wed, 11 Aug 2010 16:04:31 +0800 Subject: [PATCH] Update to r512 Add a description for the service --- AndroidManifest.xml | 6 +- res/drawable/button_ctrl.png | Bin 0 -> 3254 bytes res/drawable/button_esc.png | Bin 0 -> 3638 bytes .../{keyboard_icon.png => button_keyboard.png} | Bin res/layout/act_console.xml | 49 ++++-- res/values-zh-rTW/strings.xml | 4 +- res/values/strings.xml | 6 + src/gnu/java/nio/charset/ByteCharset.java | 188 --------------------- src/gnu/java/nio/charset/Cp437.java | 90 ---------- src/org/connectbot/ConsoleActivity.java | 56 ++++-- src/org/connectbot/PubkeyListActivity.java | 2 +- src/org/connectbot/service/ConnectionNotifier.java | 5 +- src/org/connectbot/service/TerminalBridge.java | 34 +++- .../connectbot/service/TerminalKeyListener.java | 9 +- src/org/connectbot/service/TerminalManager.java | 8 +- src/org/connectbot/util/PreferenceConstants.java | 2 +- 16 files changed, 141 insertions(+), 318 deletions(-) create mode 100644 res/drawable/button_ctrl.png create mode 100644 res/drawable/button_esc.png rename res/drawable/{keyboard_icon.png => button_keyboard.png} (100%) delete mode 100644 src/gnu/java/nio/charset/ByteCharset.java delete mode 100644 src/gnu/java/nio/charset/Cp437.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 21139ff..20b3bf8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ - + Oz@Z0f2-7z;ux~O9+4z06=<WDR*FRcSTFz- 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 literal 0 HcmV?d00001 diff --git a/res/drawable/button_esc.png b/res/drawable/button_esc.png new file mode 100644 index 0000000000000000000000000000000000000000..5f0cfc6b258008abb2f9010af36b2071f68d4393 GIT binary patch literal 3638 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 IM6N<$f|>2q4gdfE literal 0 HcmV?d00001 diff --git a/res/drawable/keyboard_icon.png b/res/drawable/button_keyboard.png similarity index 100% rename from res/drawable/keyboard_icon.png rename to res/drawable/button_keyboard.png diff --git a/res/layout/act_console.xml b/res/layout/act_console.xml index a3f2620..7d0cfee 100644 --- a/res/layout/act_console.xml +++ b/res/layout/act_console.xml @@ -92,7 +92,7 @@