commit 008e9b3e1a8c037e0275b19f284a7d2e76c9e140
author satok <satok@google.com> Tue Sep 28 11:27:44 2010 +0900
committer satok <satok@google.com> Tue Sep 28 16:52:54 2010 +0900
tree 5793f9c34484be726010f21f8cdb221217e7d4e1
parent e07bc39a3b3e15b35ff4f3abe37143d93b27f264

Fix Null pointer exception on closing and update assets

Change-Id: I30fdac74685beae06b5c61140452b26b29ae4c39

java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png

diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png
index b67732c..fad0ec4 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png
Binary files differ

java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png

diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png
index 534f1cd..215f815 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png
Binary files differ

java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png

diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png
index fba10b8..88acdd7 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png
Binary files differ

java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png

diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png
index b67732c..fad0ec4 100644
--- a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png
Binary files differ

java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png

diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png
index 534f1cd..215f815 100644
--- a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png
Binary files differ

java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png

diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png
index fba10b8..88acdd7 100644
--- a/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png
Binary files differ

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 01f3ba6..26f8a32 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1487,7 +1487,12 @@
             mVoiceInput.cancel();
         }
         requestHideSelf(0);
-        mKeyboardSwitcher.getInputView().closing();
+        if (mKeyboardSwitcher != null) {
+            LatinKeyboardView inputView = mKeyboardSwitcher.getInputView();
+            if (inputView != null) {
+                inputView.closing();
+            }
+        }
         TextEntryState.endSession();
     }
 

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

diff --git a/java/src/com/android/inputmethod/latin/LatinImeLogger.java b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
index 6d15d21..a8ab9cc 100644
--- a/java/src/com/android/inputmethod/latin/LatinImeLogger.java
+++ b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
@@ -37,8 +37,8 @@
     public static void onDestroy() {
     }
 
-    public static void logOnManualSuggestion(String before, String after, int position
-            , List<CharSequence> suggestions) {
+    public static void logOnManualSuggestion(
+            String before, String after, int position, List<CharSequence> suggestions) {
    }
 
     public static void logOnAutoSuggestion(String before, String after) {