From f7ccd50227bb9dfe0a17b1ca59cbee0c64ad1967 Mon Sep 17 00:00:00 2001
From: Rey Rey <reyncor@gmail.com>
Date: Sat, 2 Jul 2011 18:02:50 +0200
Subject: [PATCH] Whitespace clean up and light refactoring

Conflicts:

	application/src/org/yaaic/activity/ConversationActivity.java
---
 application/res/layout/about.xml                            | 2 +-
 application/res/values/settings.xml                         | 6 +++---
 application/res/values/strings.xml                          | 4 ++--
 application/src/org/yaaic/activity/AboutActivity.java       | 4 ----
 .../src/org/yaaic/activity/ConversationActivity.java        | 4 ++--
 application/src/org/yaaic/model/Settings.java               | 4 ++--
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/application/res/layout/about.xml b/application/res/layout/about.xml
index 5c9cbec..060e63a 100644
--- a/application/res/layout/about.xml
+++ b/application/res/layout/about.xml
@@ -70,7 +70,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
         android:id="@+id/about_irclink"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:text="@string/app_irc"
+		android:text="@string/app_irc"
         android:linksClickable="false"
         android:autoLink="none"
         android:textSize="16sp"
diff --git a/application/res/values/settings.xml b/application/res/values/settings.xml
index 1fc1562..2ba532e 100644
--- a/application/res/values/settings.xml
+++ b/application/res/values/settings.xml
@@ -54,11 +54,11 @@
     <string name="key_autocap_sentences">autocap_sentences</string>
     <string name="default_autocap_sentences">false</string>
 
-	<string name="key_ime_extract">Large landscape input</string>
+	<string name="key_ime_extract">ime_extract</string>
     <string name="default_ime_extract">true</string>
 
-    <string name="key_fullscreen_conversation">Fullscreen chatting</string>
-    <string name="default_fullscreen_conversation">false</string>
+	<string name="key_fullscreen_conversation">fullscreen_conversations</string>
+	<string name="default_fullscreen_conversation">false</string>
 
     <string name="key_history_size">history_size</string>
     <string name="default_history_size">30</string>
diff --git a/application/res/values/strings.xml b/application/res/values/strings.xml
index 9950785..737a468 100644
--- a/application/res/values/strings.xml
+++ b/application/res/values/strings.xml
@@ -220,8 +220,8 @@
     <string name="settings_autocorrect_text_desc">Use dictionary to autocorrect typed text in chat</string>
     <string name="settings_autocap_sentences_title">Auto-capitalize sentences</string>
     <string name="settings_autocap_sentences_desc">Automatically capitalize the first word of sentences</string>
-    <string name="settings_ime_extract_title">Large landscape input</string>
-    <string name="settings_ime_extract_desc">Makes the landscape input field multilined</string>
+    <string name="settings_ime_extract_title">Fullscreen input in landscape</string>
+    <string name="settings_ime_extract_desc">Use fullscreen keyboard when in landscape mode</string>
     <string name="settings_fullscreen_conversation_title">Fullscreen chats</string>
     <string name="settings_fullscreen_conversation_desc">Fullscreen the application when chatting</string>
     <string name="settings_history_size_title">History size</string>
diff --git a/application/src/org/yaaic/activity/AboutActivity.java b/application/src/org/yaaic/activity/AboutActivity.java
index 3c1c65e..ac5e8d9 100644
--- a/application/src/org/yaaic/activity/AboutActivity.java
+++ b/application/src/org/yaaic/activity/AboutActivity.java
@@ -58,9 +58,5 @@ public class AboutActivity extends Activity
                 startActivity(i);
             }
         });
-
     }
-
-
-
 }
diff --git a/application/src/org/yaaic/activity/ConversationActivity.java b/application/src/org/yaaic/activity/ConversationActivity.java
index 6a037d9..bcfc407 100644
--- a/application/src/org/yaaic/activity/ConversationActivity.java
+++ b/application/src/org/yaaic/activity/ConversationActivity.java
@@ -252,14 +252,14 @@ public class ConversationActivity extends Activity implements ServiceConnection,
         if (settings.autoCapSentences()) {
             setInputTypeFlags |= InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
         }
-        if (isLandscape && settings.imeExtract()) {
+        if (isLandscape && !settings.imeExtract()) {
             /* Replace the Enter key with a smiley instead of Send, to make it
                more difficult to accidentally hit send
                We'd like to do this in portrait too, but wouldn't have a Send
                button in that case */
             setInputTypeFlags |= InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE;
         } else {
-            input.setImeOptions(input.getImeOptions());
+            input.setImeOptions(input.getImeOptions() | EditorInfo.IME_FLAG_NO_EXTRACT_UI);
         }
         input.setInputType(input.getInputType() | setInputTypeFlags);
 
diff --git a/application/src/org/yaaic/model/Settings.java b/application/src/org/yaaic/model/Settings.java
index 43448b3..c0d4733 100644
--- a/application/src/org/yaaic/model/Settings.java
+++ b/application/src/org/yaaic/model/Settings.java
@@ -284,7 +284,7 @@ public class Settings
     }
 
     /**
-     * Whether conversations should be viewed in Fullscreen glory
+     * Whether the fullscreen keyboard should be used in landscape mode.
      */
     public boolean imeExtract()
     {
@@ -295,7 +295,7 @@ public class Settings
     }
 
     /**
-     * Whether conversations should be viewed in Fullscreen glory
+     * Whether conversations should be viewed in Fullscreen glory.
      */
     public boolean fullscreenConversations()
     {