summaryrefslogtreecommitdiff
path: root/core/java/android/widget/CompoundButton.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-03-08 21:08:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-03-08 21:08:56 +0000
commit7e547fbe88b66859f8d9959e79cfd2c20edecef2 (patch)
treee100c2df5fa6b15c11c8a50f24828e864cc39b0d /core/java/android/widget/CompoundButton.java
parent932eb90eb4f07a24f33143a2ccb9d8a5102f9937 (diff)
parent8931e303700a5adb6e013c2b5a6cec621eede968 (diff)
Merge "Replace AutoFillType by view constants."
Diffstat (limited to 'core/java/android/widget/CompoundButton.java')
-rw-r--r--core/java/android/widget/CompoundButton.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/widget/CompoundButton.java b/core/java/android/widget/CompoundButton.java
index 141b52fd2ce3..dce33a0e6fbb 100644
--- a/core/java/android/widget/CompoundButton.java
+++ b/core/java/android/widget/CompoundButton.java
@@ -36,7 +36,6 @@ import android.view.ViewStructure;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.autofill.AutoFillManager;
-import android.view.autofill.AutoFillType;
import android.view.autofill.AutoFillValue;
import com.android.internal.R;
@@ -590,8 +589,8 @@ public abstract class CompoundButton extends Button implements Checkable {
}
@Override
- public AutoFillType getAutoFillType() {
- return isEnabled() ? AutoFillType.forToggle() : null;
+ public @AutofillType int getAutofillType() {
+ return isEnabled() ? AUTOFILL_TYPE_TOGGLE : AUTOFILL_TYPE_NONE;
}
@Override