Merge "Refactor KeyboardAccessibilityDelegate class a bit"

java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityDelegate.java

@@ -16,6 +16,7 @@
 
 package com.android.inputmethod.accessibility;
 
+import android.content.Context;
 import android.os.SystemClock;
 import android.support.v4.view.AccessibilityDelegateCompat;
 import android.support.v4.view.ViewCompat;
@@ -69,6 +70,19 @@ public class KeyboardAccessibilityDelegate<KV extends KeyboardView>
         return mKeyboard;
     }
 
+    /**
+     * Sends a window state change event with the specified string resource id.
+     *
+     * @param resId The string resource id of the text to send with the event.
+     */
+    protected void sendWindowStateChanged(final int resId) {
+        if (resId == 0) {
+            return;
+        }
+        final Context context = mKeyboardView.getContext();
+        sendWindowStateChanged(context.getString(resId));
+    }
+
     /**
      * Sends a window state change event with the specified text.
      *

java/src/com/android/inputmethod/accessibility/MainKeyboardAccessibilityDelegate.java

@@ -163,17 +163,13 @@ public final class MainKeyboardAccessibilityDelegate
         default:
             return;
         }
-        final String text = mKeyboardView.getContext().getString(resId);
+        sendWindowStateChanged(resId);
-        sendWindowStateChanged(text);
     }
 
     /**
      * Announces that the keyboard has been hidden.
      */
     private void announceKeyboardHidden() {
-        final Context context = mKeyboardView.getContext();
+        sendWindowStateChanged(R.string.announce_keyboard_hidden);
-        final String text = context.getString(R.string.announce_keyboard_hidden);
-
-        sendWindowStateChanged(text);
     }
 }