summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-01-08 16:33:45 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-08 16:33:45 -0800
commitc9a26f291b8a845fcb5e3034c259d13d3297a98d (patch)
tree564f2f677d6197ae1e90df22c0fccac0f2bf876b /core
parentcffea95e1ef203223b87ae8a6bde415b25c5c415 (diff)
parentaa3b5961c0142fe2fe87a5e4f67a12b3728f1bea (diff)
downloadframeworks_base-c9a26f291b8a845fcb5e3034c259d13d3297a98d.zip
frameworks_base-c9a26f291b8a845fcb5e3034c259d13d3297a98d.tar.gz
frameworks_base-c9a26f291b8a845fcb5e3034c259d13d3297a98d.tar.bz2
am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering)
Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp * commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea': javadoc change: fix the selector sample XML in the class
Diffstat (limited to 'core')
-rw-r--r--core/java/android/widget/ImageButton.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/widget/ImageButton.java b/core/java/android/widget/ImageButton.java
index 2fc29bc..5c05170 100644
--- a/core/java/android/widget/ImageButton.java
+++ b/core/java/android/widget/ImageButton.java
@@ -57,6 +57,11 @@ import java.util.Map;
* based on the state of the button and the corresponding images
* defined in the XML.</p>
*
+ * <p>The order of the {@code &lt;item>} elements is important because they are
+ * evaluated in order. This is why the "normal" button image comes last, because
+ * it will only be applied after {@code android:state_pressed} and {@code
+ * android:state_focused} have both evaluated false.</p>
+ *
* <p><strong>XML attributes</strong></p>
* <p>
* See {@link android.R.styleable#ImageView Button Attributes},