From f147794fd41491a3383e6aca6d49007f58124068 Mon Sep 17 00:00:00 2001
From: alanv <alanv@google.com>
Date: Tue, 5 Jun 2012 11:02:54 -0700
Subject: Refresh Accessibility key mapping when KeyboardView changes
 Keyboards.

Bug: 6609626
Change-Id: I93d764b46e96fe70b61c91a7dcb46945ac8853dd
---
 .../accessibility/AccessibilityEntityProvider.java          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java')

diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java b/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java
index 9986f6ec0..ba08c593c 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java
+++ b/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java
@@ -85,9 +85,20 @@ public class AccessibilityEntityProvider extends AccessibilityNodeProviderCompat
      */
     public void setView(KeyboardView keyboardView) {
         mKeyboardView = keyboardView;
+        updateParentLocation();
+
+        // Since this class is constructed lazily, we might not get a subsequent
+        // call to setKeyboard() and therefore need to call it now.
+        setKeyboard(mKeyboardView.getKeyboard());
+    }
 
+    /**
+     * Sets the keyboard represented by this node provider.
+     *
+     * @param keyboard The keyboard to represent.
+     */
+    public void setKeyboard(Keyboard keyboard) {
         assignVirtualViewIds();
-        updateParentLocation();
     }
 
     /**
-- 
cgit v1.2.3-83-g751a