summaryrefslogtreecommitdiff
path: root/core/java/android/widget/CompoundButton.java
diff options
context:
space:
mode:
authorFelipe Leme <felipeal@google.com>2017-02-27 12:46:04 -0800
committerFelipe Leme <felipeal@google.com>2017-03-01 10:43:48 -0800
commit305b72c92568a2dd2ece08caebd610ec8bd473f4 (patch)
treec89f25cd67c0ded42a4aea9d5662d1a0534cbee4 /core/java/android/widget/CompoundButton.java
parentf561734e9cad622b04422916e48dd6bf8f38e221 (diff)
Added auto-fill support for DatePicker and TimePicker.
Also fixed some getAutoFillType() implementations to return null when the view is disabled. Bug: 33550221 Bug: 35840787 Test: CtsAutoFillServiceTestCases (with new tests) pass Test: m update-api Change-Id: I46acc1fb106cf2153515cc1c9567b34cfabd1c62
Diffstat (limited to 'core/java/android/widget/CompoundButton.java')
-rw-r--r--core/java/android/widget/CompoundButton.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/CompoundButton.java b/core/java/android/widget/CompoundButton.java
index 887c59a2d71c..141b52fd2ce3 100644
--- a/core/java/android/widget/CompoundButton.java
+++ b/core/java/android/widget/CompoundButton.java
@@ -591,7 +591,7 @@ public abstract class CompoundButton extends Button implements Checkable {
@Override
public AutoFillType getAutoFillType() {
- return AutoFillType.forToggle();
+ return isEnabled() ? AutoFillType.forToggle() : null;
}
@Override