Load KeyCodeDescriptionMapper class lazily

Change-Id: I2cba2bb5b2f449ed29895365b9c6ca285a7640fe

1 files changed, 3 insertions, 5 deletions

diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index 495cfa981..77877143b 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -381,14 +381,12 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
         final int keyHeight = keyboard.mMostCommonKeyHeight - keyboard.mVerticalGap;
         mLanguageOnSpacebarTextSize = keyHeight * mLanguageOnSpacebarTextRatio;
 
-        final MainKeyboardAccessibilityDelegate accessibilityDelegate;
         if (AccessibilityUtils.getInstance().isAccessibilityEnabled()) {
-            accessibilityDelegate = new MainKeyboardAccessibilityDelegate(this, mKeyDetector);
-            accessibilityDelegate.setKeyboard(keyboard);
+            mAccessibilityDelegate = new MainKeyboardAccessibilityDelegate(this, mKeyDetector);
+            mAccessibilityDelegate.setKeyboard(keyboard);
         } else {
-            accessibilityDelegate = null;
+            mAccessibilityDelegate = null;
         }
-        mAccessibilityDelegate = accessibilityDelegate;
     }
 
     /**