summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/SearchView.java
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-05-07 11:33:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-07 11:33:16 -0700
commit44e3f88f2f80c7dfbe36c22878d129251ba13165 (patch)
treedf9960f4fefde191c6bb83994e97a589fccffc71 /core/java/android/widget/SearchView.java
parenta09b06effff87f9c073cdc7729884adc41286fe1 (diff)
parent3d3e7a5816b5c78687bbfa4ef32abb8f1a5b83e1 (diff)
downloadframeworks_base-44e3f88f2f80c7dfbe36c22878d129251ba13165.zip
frameworks_base-44e3f88f2f80c7dfbe36c22878d129251ba13165.tar.gz
frameworks_base-44e3f88f2f80c7dfbe36c22878d129251ba13165.tar.bz2
Merge "Javadoc improvements in SearchView per API review." into jb-dev
Diffstat (limited to 'core/java/android/widget/SearchView.java')
-rw-r--r--core/java/android/widget/SearchView.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index 561326e..521597b 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -576,6 +576,8 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
/**
* Returns the default iconified state of the search field.
* @return
+ *
+ * @attr ref android.R.styleable#SearchView_iconifiedByDefault
*/
public boolean isIconfiedByDefault() {
return mIconifiedByDefault;
@@ -696,6 +698,8 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
* Gets the specified maximum width in pixels, if set. Returns zero if
* no maximum width was specified.
* @return the maximum width of the view
+ *
+ * @attr ref android.R.styleable#SearchView_maxWidth
*/
public int getMaxWidth() {
return mMaxWidth;