Added better support for virtual (soft) keyboards

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@217 df292f66-193f-0410-a5fc-6d59da041ff2

2 files changed, 28 insertions, 4 deletions

diff --git a/src/org/connectbot/ConsoleActivity.java b/src/org/connectbot/ConsoleActivity.java
index 3bd20d8..c02a75a 100644
--- a/src/org/connectbot/ConsoleActivity.java
+++ b/src/org/connectbot/ConsoleActivity.java
@@ -34,6 +34,8 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Bundle;
@@ -302,13 +304,21 @@ public class ConsoleActivity extends Activity {
 					WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		}
 
+		String rotateDefault;
+		if (Resources.getSystem().getConfiguration().keyboard == Configuration.KEYBOARD_NOKEYS)
+			rotateDefault = getString(R.string.list_rotation_port);
+		else
+			rotateDefault = getString(R.string.list_rotation_land);
+
+		String rotate = prefs.getString(getString(R.string.pref_rotation), rotateDefault);
+		if (getString(R.string.list_rotation_default).equals(rotate))
+			rotate = rotateDefault;
+
 		// request a forced orientation if requested by user
-		String rotate = prefs.getString(getString(R.string.pref_rotation), getString(R.string.list_rotation_land));
-		if(getString(R.string.list_rotation_land).equals(rotate)) {
+		if (getString(R.string.list_rotation_land).equals(rotate))
 			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-		} else if (getString(R.string.list_rotation_port).equals(rotate)) {
+		else if (getString(R.string.list_rotation_port).equals(rotate))
 			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-		}
 
 		// TODO find proper way to disable volume key beep if it exists.
 		setVolumeControlStream(AudioManager.STREAM_MUSIC);
diff --git a/src/org/connectbot/TerminalView.java b/src/org/connectbot/TerminalView.java
index cb7b465..bf70835 100644
--- a/src/org/connectbot/TerminalView.java
+++ b/src/org/connectbot/TerminalView.java
@@ -32,6 +32,9 @@ import android.graphics.PixelXorXfermode;
 import android.graphics.RectF;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
 import android.widget.Toast;
 
 /**
@@ -231,4 +234,15 @@ public class TerminalView extends View implements FontSizeChangedListener {
 	public void setNotifications(boolean value) {
 		notifications = value;
 	}
+
+	@Override
+	public boolean onCheckIsTextEditor() {
+		return true;
+	}
+
+	@Override
+	public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+		outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_ACTION_NONE;
+		return new BaseInputConnection(this, false);
+	}
 }