From 5c48724425067c34a0b41f5bc60575315b80b86a Mon Sep 17 00:00:00 2001 From: Rey Rey Date: Sat, 2 Jul 2011 18:04:06 +0200 Subject: [PATCH] Future proofed ime no extract support, enhanced performance of fullscreen patch. Conflicts: application/src/org/yaaic/activity/ConversationActivity.java --- .../src/org/yaaic/activity/ConversationActivity.java | 3 ++- application/src/org/yaaic/view/ConversationLayout.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/application/src/org/yaaic/activity/ConversationActivity.java b/application/src/org/yaaic/activity/ConversationActivity.java index bcfc407..75bd67d 100644 --- a/application/src/org/yaaic/activity/ConversationActivity.java +++ b/application/src/org/yaaic/activity/ConversationActivity.java @@ -258,8 +258,9 @@ public class ConversationActivity extends Activity implements ServiceConnection, 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; + input.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI); } else { - input.setImeOptions(input.getImeOptions() | EditorInfo.IME_FLAG_NO_EXTRACT_UI); + input.setImeOptions(input.getImeOptions() & EditorInfo.IME_FLAG_NO_EXTRACT_UI); } input.setInputType(input.getInputType() | setInputTypeFlags); diff --git a/application/src/org/yaaic/view/ConversationLayout.java b/application/src/org/yaaic/view/ConversationLayout.java index d1fc10e..f594145 100644 --- a/application/src/org/yaaic/view/ConversationLayout.java +++ b/application/src/org/yaaic/view/ConversationLayout.java @@ -106,6 +106,10 @@ public class ConversationLayout extends LinearLayout { super.onMeasure(widthMeasureSpec, heightMeasureSpec); + if(!fullscreen && !isLandscape){ + return; + } + int height = getWindowHeight(); if (curHeight != height) { curHeight = height; @@ -113,8 +117,6 @@ public class ConversationLayout extends LinearLayout status = (ImageView) findViewById(R.id.status); title = (TextView) findViewById(R.id.title); final float scale = getResources().getDisplayMetrics().density; - android.util.Log.d("CONVO height",String.valueOf(height)+", Scale: "+String.valueOf(height*scale)); - //Give us at least an inch, or we'll have to make sacrifices. if (height < 160*scale) {