summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2011-02-07 13:51:36 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-02-07 13:51:36 -0800
commit97228942d84fb93a155dfe2e62c927c8ea2eccd0 (patch)
tree7380077a0785bfe0d2bcd25791befb5eb98fa386
parent53595b1688d70810ea3e8b47668e0d89a9773a02 (diff)
parent602a891aea0392168e90f9dee61b33f45c698f34 (diff)
am 602a891a: am b0f1cfff: Merge "docs: SearchView is iconified by default" into honeycomb
* commit '602a891aea0392168e90f9dee61b33f45c698f34': docs: SearchView is iconified by default
-rw-r--r--core/java/android/widget/SearchView.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index a37f12ebed2b..f051b770ee0d 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -330,8 +330,8 @@ public class SearchView extends LinearLayout {
/**
* Sets a listener to inform when the search button is pressed. This is only
- * relevant when the text field is not visible by default. Calling #setIconified(false)
- * can also cause this listener to be informed.
+ * relevant when the text field is not visible by default. Calling {@link #setIconified
+ * setIconified(false)} can also cause this listener to be informed.
*
* @param listener the listener to inform when the search button is clicked or
* the text field is programmatically de-iconified.
@@ -386,7 +386,7 @@ public class SearchView extends LinearLayout {
* if the default state is iconified, then it collapses to that state when the close button
* is pressed. Changes to this property will take effect immediately.
*
- * <p>The default value is false.</p>
+ * <p>The default value is true.</p>
*
* @param iconified whether the search field should be iconified by default
*/