diff options
author | Alan Viverette <alanv@google.com> | 2014-09-10 16:05:35 -0700 |
---|---|---|
committer | Alan Viverette <alanv@google.com> | 2014-09-10 16:05:35 -0700 |
commit | 362f984df3b3ef555cce128acc7c693209c6841c (patch) | |
tree | 57a7bbc723438a4bab5fd4b3ac6eaed3f056d87b /core/java/android/widget/SearchView.java | |
parent | 3ab7bf1a3d1383190a8c3a84f1216227529fdcec (diff) | |
download | frameworks_base-362f984df3b3ef555cce128acc7c693209c6841c.zip frameworks_base-362f984df3b3ef555cce128acc7c693209c6841c.tar.gz frameworks_base-362f984df3b3ef555cce128acc7c693209c6841c.tar.bz2 |
Make SearchView styles public, remove public Holo styles added in L
We shouldn't adding styles for a deprecated theme. Also this cleans up
the removed public resources for easier deletion later.
BUG: 17455273
Change-Id: I2c5caf354aab91463702f25c38f0dd29c153ba44
Diffstat (limited to 'core/java/android/widget/SearchView.java')
-rw-r--r-- | core/java/android/widget/SearchView.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index 0289ccc..dfdf606 100644 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -262,7 +262,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { attrs, R.styleable.SearchView, defStyleAttr, defStyleRes); final LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE); - final int layoutResId = a.getResourceId(R.styleable.SearchView_layout, 0); + final int layoutResId = a.getResourceId(R.styleable.SearchView_layout, R.layout.search_view); inflater.inflate(layoutResId, this, true); mQueryTextView = (SearchAutoComplete) findViewById(R.id.search_src_text); @@ -288,7 +288,8 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { mSearchHintIcon.setImageDrawable(a.getDrawable(R.styleable.SearchView_searchIcon)); // Extract dropdown layout resource IDs for later use. - mSuggestionRowLayout = a.getResourceId(R.styleable.SearchView_suggestionRowLayout, 0); + mSuggestionRowLayout = a.getResourceId(R.styleable.SearchView_suggestionRowLayout, + R.layout.search_dropdown_item_icons_2line); mSuggestionCommitIconResId = a.getResourceId(R.styleable.SearchView_commitIcon, 0); mSearchButton.setOnClickListener(mOnClickListener); |