diff options
| author | Jeff Brown <jeffbrown@google.com> | 2015-06-04 21:10:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-04 21:11:05 +0000 |
| commit | 16422b25f7a814be0c3ceba44a4e9e62b10427a5 (patch) | |
| tree | 939ec3a5d48ca202064ab7b8acc9a67bac823c5d /core/java/android/util/StateSet.java | |
| parent | 65561b5c5100d4d4b18d5086cba52d796122e78d (diff) | |
| parent | 143739cb6b0468804f83f2398b3666eb21280de6 (diff) | |
| download | frameworks_base-16422b25f7a814be0c3ceba44a4e9e62b10427a5.zip frameworks_base-16422b25f7a814be0c3ceba44a4e9e62b10427a5.tar.gz frameworks_base-16422b25f7a814be0c3ceba44a4e9e62b10427a5.tar.bz2 | |
Merge changes If241e329,Ib69b6987 into mnc-dev
* changes:
Clarify docs on registerContentObserver.
Add missing docs to StateSet.
Diffstat (limited to 'core/java/android/util/StateSet.java')
| -rw-r--r-- | core/java/android/util/StateSet.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/util/StateSet.java b/core/java/android/util/StateSet.java index 83dfc47..c2a6a7a 100644 --- a/core/java/android/util/StateSet.java +++ b/core/java/android/util/StateSet.java @@ -119,7 +119,14 @@ public class StateSet { /** @hide */ public StateSet() {} + /** + * A state specification that will be matched by all StateSets. + */ public static final int[] WILD_CARD = new int[0]; + + /** + * A state set that does not contain any valid states. + */ public static final int[] NOTHING = new int[] { 0 }; /** |