aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/res/drawable-mdpi/sym_keyboard_smiley_holo.pngbin1260 -> 0 bytes
-rw-r--r--java/res/xml-xlarge/kbd_key_styles.xml8
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java4
3 files changed, 6 insertions, 6 deletions
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 90a127212..000000000
--- a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png
+++ /dev/null
Binary files differ
diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml
index 26659a2ad..d211e5e61 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" />
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 02a696088..053bf6c1a 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -868,14 +868,14 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
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