nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am 6b0d0fa3: am f8233ec3: Merge "Refresh Accessibility key mapping when KeyboardView changes Keyboards." into jb-dev

Browse source 
* commit '6b0d0fa3501247ccf3190c938dec580102fe0473':
  Refresh Accessibility key mapping when KeyboardView changes Keyboards.
This commit is contained in:
Charles Chen 2012-06-05 15:02:27 -07:00 committed by Android Git Automerger
commit 7b250c25f7
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java
View file

@ -85,9 +85,20 @@ public class AccessibilityEntityProvider extends AccessibilityNodeProviderCompat
*/
public void setView(KeyboardView keyboardView) {
mKeyboardView = keyboardView;
assignVirtualViewIds();
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();
}
/**

6
java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
View file

@ -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
java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
View file

@ -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);
}
/**