Merge "Refresh Accessibility key mapping when KeyboardView changes Keyboards." into jb-dev (f8233ec3) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+12 −1

Original line number	Diff line number	Diff line
		@@ -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();
		}

		/**

+6 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,12 @@ public class AccessibleKeyboardViewProxy extends AccessibilityDelegateCompat {
		}
		}

		public void setKeyboard(Keyboard keyboard) {
		if (mAccessibilityNodeProvider != null) {
		mAccessibilityNodeProvider.setKeyboard(keyboard);
		}
		}

		/**
		* Proxy method for View.getAccessibilityNodeProvider(). This method is
		* called in SDK version 15 and higher to obtain the virtual node hierarchy

+4 −0

Original line number	Diff line number	Diff line
		@@ -468,6 +468,10 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.latinKeyboardView_setKeyboard(keyboard);
		}

		// This always needs to be set since the accessibility state can
		// potentially change without the keyboard being set again.
		AccessibleKeyboardViewProxy.getInstance().setKeyboard(keyboard);
		}

		/**