From 305b72c92568a2dd2ece08caebd610ec8bd473f4 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Mon, 27 Feb 2017 12:46:04 -0800
Subject: 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
---
 core/java/android/widget/CompoundButton.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/java/android/widget/CompoundButton.java')

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
-- 
cgit v1.2.3