aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJeffrey Sharkey <jsharkey@jsharkey.org>2008-10-26 00:00:36 +0000
committerJeffrey Sharkey <jsharkey@jsharkey.org>2008-10-26 00:00:36 +0000
commit02b5d6cde18301bb5d1895896b18845c776c805d (patch)
tree4c91eb46ddf091efb243ef93ce841f17b17ef548 /res
parent2cecc0403f922721d6c19505b342935e9a29de14 (diff)
downloadconnectbot-02b5d6cde18301bb5d1895896b18845c776c805d.tar.gz
connectbot-02b5d6cde18301bb5d1895896b18845c776c805d.tar.bz2
connectbot-02b5d6cde18301bb5d1895896b18845c776c805d.zip
* refactored prompting gui component into PromptHelper, makes it easier now because it offers blocking methods to get strings
* also added boolean prompt support for hostkey yes/no from user * added checking and storing of hostkeys into backend database, successfully tested * created new icon using android style guide pdf, older icon is still here
Diffstat (limited to 'res')
-rw-r--r--res/drawable/icon.pngbin5088 -> 5992 bytes
-rw-r--r--res/drawable/icon_older.pngbin0 -> 5088 bytes
-rw-r--r--res/layout/act_console.xml40
-rw-r--r--res/xml/preferences.xml2
4 files changed, 38 insertions, 4 deletions
diff --git a/res/drawable/icon.png b/res/drawable/icon.png
index 323b99f..6f5db07 100644
--- a/res/drawable/icon.png
+++ b/res/drawable/icon.png
Binary files differ
diff --git a/res/drawable/icon_older.png b/res/drawable/icon_older.png
new file mode 100644
index 0000000..323b99f
--- /dev/null
+++ b/res/drawable/icon_older.png
Binary files differ
diff --git a/res/layout/act_console.xml b/res/layout/act_console.xml
index 39564d8..36c73b4 100644
--- a/res/layout/act_console.xml
+++ b/res/layout/act_console.xml
@@ -19,6 +19,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
+ android:background="#ff000000"
>
<TextView
@@ -36,7 +37,7 @@
android:layout_height="fill_parent"
/>
- <FrameLayout
+ <RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
@@ -48,9 +49,42 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:password="true"
- android:singleLine="true"
+ android:singleLine="true"
+ android:visibility="gone"
/>
+
+ <TextView
+ android:id="@+id/console_prompt"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:paddingRight="100dip"
+ />
+
+ <Button
+ android:id="@+id/console_prompt_no"
+ android:text="No"
+ android:paddingTop="5dip" android:paddingBottom="10dip"
+ android:paddingLeft="40dip" android:paddingRight="40dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:visibility="gone"
+ />
+
+ <Button
+ android:id="@+id/console_prompt_yes"
+ android:text="Yes"
+ android:paddingTop="5dip" android:paddingBottom="10dip"
+ android:paddingLeft="40dip" android:paddingRight="40dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toLeftOf="@id/console_prompt_no"
+ android:visibility="gone"
+ />
+
+ </RelativeLayout>
- </FrameLayout>
</RelativeLayout> \ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index c64d0e5..d7fd030 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -29,7 +29,7 @@
/>
<EditTextPreference
- android:key="@string/pref_emulation"
+ android:key="@string/pref_scrollback"
android:title="Scrollback size"
android:summary="Size of scrollback buffer to keep in memory for each console"
android:defaultValue="140"