Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 24635 into eclair

Browse Source 
* changes:
  Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
This commit is contained in:
Android (Google) Code Review
2009-09-11 16:46:19 -04:00
parent 8cae124af2 7ed6ee5692
commit 162ec9993e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/accessibilityservice/AccessibilityService.java
View File

@@ -185,7 +185,7 @@ public abstract class AccessibilityService extends Service {
private final HandlerCaller mCaller;
private AccessibilityService mTarget;
private final AccessibilityService mTarget;
public IEventListenerWrapper(AccessibilityService context) {
mTarget = context;
@@ -211,9 +211,9 @@ public abstract class AccessibilityService extends Service {
switch (message.what) {
case DO_ON_ACCESSIBILITY_EVENT :
AccessibilityEvent event = (AccessibilityEvent) message.obj;
if (event != null){
mTarget.onAccessibilityEvent(event);
event.recycle();
if (event != null) {
mTarget.onAccessibilityEvent(event);
event.recycle();
}
return;
case DO_ON_INTERRUPT :

6
core/java/android/widget/TextView.java
View File

@@ -732,7 +732,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
} else if (digits != null) {
mInput = DigitsKeyListener.getInstance(digits.toString());
mInputType = inputType;
// If no input type was specified, we will default to generic
// text, since we can't tell the IME about the set of digits
// that was selected.
mInputType = inputType != EditorInfo.TYPE_NULL
? inputType : EditorInfo.TYPE_CLASS_TEXT;
} else if (inputType != EditorInfo.TYPE_NULL) {
setInputType(inputType, true);
singleLine = (inputType&(EditorInfo.TYPE_MASK_CLASS