commit 15a7e837ab619df1e3844cd59b337c6ac56a0daf
author satok <satok@google.com> Thu Jan 20 22:22:13 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 20 22:22:13 2011 -0800
tree 3400ffc10859d617ddee4fecbe876ddfbb2e10b9
parent 6e7dcd755eb4292b0b92cbba8237174b6317da05
parent 6f7218627eda110a8454053f8ecb7b80edfdc8ce

Merge "Dim previously suggested words" into honeycomb

java/res/drawable-mdpi/sym_keyboard_smiley_holo.png

diff --git a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png
deleted file mode 100644
index 90a1272..0000000
--- a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png
+++ /dev/null
Binary files differ

java/res/xml-xlarge/kbd_key_styles.xml

diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml
index 26659a2..d211e5e 100644
--- a/java/res/xml-xlarge/kbd_key_styles.xml
+++ b/java/res/xml-xlarge/kbd_key_styles.xml
@@ -60,8 +60,8 @@
                 latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
             <key-style
                 latin:styleName="smileyKeyStyle"
-                latin:keyIcon="@drawable/sym_keyboard_smiley_holo"
-                latin:keyOutputText=";-) "
+                latin:keyLabel=":-)"
+                latin:keyOutputText=":-) "
                 latin:keyHintIcon="@drawable/hint_popup_holo"
                 latin:popupCharacters="@string/alternates_for_smiley"
                 latin:maxPopupKeyboardColumn="5" />
@@ -114,8 +114,8 @@
                 latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
             <key-style
                 latin:styleName="smileyKeyStyle"
-                latin:keyLabel=";-)"
-                latin:keyOutputText=";-) "
+                latin:keyLabel=":-)"
+                latin:keyOutputText=":-) "
                 latin:keyHintIcon="@drawable/hint_popup_holo"
                 latin:popupCharacters="@string/alternates_for_smiley"
                 latin:maxPopupKeyboardColumn="5" />

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 02a6960..053bf6c 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -868,14 +868,14 @@
         if (!isFullscreenMode()) {
             outInsets.contentTopInsets = outInsets.visibleTopInsets;
         }
-        KeyboardView inputView = mKeyboardSwitcher.getInputView();
+        /*KeyboardView inputView = mKeyboardSwitcher.getInputView();
         if (inputView != null) {
             // Screen's heightPixels may be too big, but want to make
             // it large enough to cover status bar in any cases.
             outInsets.touchableInsets = InputMethodService.Insets.TOUCHABLE_INSETS_REGION;
             outInsets.touchableRegion.set(
                     0, 0, inputView.getWidth(), getResources().getDisplayMetrics().heightPixels);
-        }
+        }*/
     }
 
     @Override