commit e8e153490d4b3a9d0cea7cd86f49d56259c7df27
author satok <satok@google.com> Thu Jul 01 14:45:28 2010 -0700
committer Gerrit Code Review <gerrit2@ppgnte-ubiq63.twd.corp.google.com> Thu Jul 01 14:45:28 2010 -0700
tree 0935f0f3115be0a2ace298b59230a700a7898f59
parent a86a942d7c95c1ab1225f705f712383258b4d614
parent ac108d5b341f484d48009ba0e90524569bab84f2

Merge "Null check at BackToAcceptedDefault"

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

diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 11dd8b7..2ce91ce 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -293,17 +293,17 @@
             mSpaceIcon = mRes.getDrawable(R.drawable.sym_bkeyboard_space);
             mMicIcon = mRes.getDrawable(R.drawable.sym_bkeyboard_mic);
             m123MicIcon = mRes.getDrawable(R.drawable.sym_bkeyboard_123_mic);
-            if (mF1Key != null) {
-                mF1Key.icon = mMicIcon;
-            }
         } else {
             mShiftLockIcon = mRes.getDrawable(R.drawable.sym_keyboard_shift_locked);
             mSpaceIcon = mRes.getDrawable(R.drawable.sym_keyboard_space);
             mMicIcon = mRes.getDrawable(R.drawable.sym_keyboard_mic);
             m123MicIcon = mRes.getDrawable(R.drawable.sym_keyboard_123_mic);
-            if (mF1Key != null) {
-                mF1Key.icon = mMicIcon;
-            }
+        }
+        if (m123Key != null) {
+            m123Key.icon = m123MicIcon;
+        }
+        if (mF1Key != null) {
+            mF1Key.icon = mMicIcon;
         }
         if (mSpaceKey != null) {
             mSpaceKey.icon = mSpaceIcon;