diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/SearchView.java | 5 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 17 | ||||
| -rw-r--r-- | core/res/res/values/removed.xml | 26 | ||||
| -rw-r--r-- | core/res/res/values/themes_material.xml | 3 |
5 files changed, 38 insertions, 19 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); diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index a00ed5d..026908a 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -7434,12 +7434,6 @@ <attr name="settingsActivity" /> </declare-styleable> - <!-- @removed --> - <attr name="__removed1" format="reference" /> - - <!-- TODO: Spacer to be removed from here and public.xml --> - <attr name="__removed2" format="reference" /> - <!-- Attributes that can be used with <code>rating-system-definition</code> tags inside of the XML resource that describes TV content rating of a {@link android.media.tv.TvInputService}, which is referenced from its diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 5b047f7..8bb3cdf 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2307,16 +2307,14 @@ <public type="style" name="Widget.Toolbar" /> <public type="style" name="Widget.Toolbar.Button.Navigation" /> - <public type="style" name="Widget.Holo.FastScroll" /> - <public type="style" name="Widget.Holo.StackView" /> - - <public type="style" name="Widget.Holo.Light.Button.Borderless" /> - <public type="style" name="Widget.Holo.Light.FastScroll" /> - <public type="style" name="Widget.Holo.Light.StackView" /> + <public type="style" name="__removed3" /> + <public type="style" name="__removed4" /> + <public type="style" name="__removed5" /> + <public type="style" name="__removed6" /> + <public type="style" name="__removed7" /> <public type="style" name="Widget.DeviceDefault.FastScroll" /> <public type="style" name="Widget.DeviceDefault.StackView" /> - <public type="style" name="Widget.DeviceDefault.Light.FastScroll" /> <public type="style" name="Widget.DeviceDefault.Light.StackView" /> @@ -2540,7 +2538,7 @@ <public type="style" name="Theme.Leanback.FormWizard"/> - <public type="style" name="__removed" /> + <public type="style" name="__removed1" /> <public type="style" name="TextAppearance.Material.Notification" /> <public type="style" name="TextAppearance.Material.Notification.Title" /> <public type="style" name="TextAppearance.Material.Notification.Line2" /> @@ -2559,6 +2557,9 @@ <public type="style" name="Theme.Material.Light.Dialog.Alert" /> <public type="style" name="Theme.Material.Light.Dialog.Presentation" /> + <public type="style" name="Widget.Material.SearchView" /> + <public type="style" name="Widget.Material.Light.SearchView" /> + <public-padding type="string" name="l_resource_pad" end="0x01040030" /> <public type="string" name="config_webSettingsDefaultTextEncoding" /> diff --git a/core/res/res/values/removed.xml b/core/res/res/values/removed.xml new file mode 100644 index 0000000..8eaca29 --- /dev/null +++ b/core/res/res/values/removed.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- Placeholder resources to be removed before release. --> +<resources> + <style name="__removed1" /> + <attr name="__removed2" /> + <style name="__removed3" /> + <style name="__removed4" /> + <style name="__removed5" /> + <style name="__removed6" /> + <style name="__removed7" /> +</resources> diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml index 4aca02e..485ea08 100644 --- a/core/res/res/values/themes_material.xml +++ b/core/res/res/values/themes_material.xml @@ -1256,7 +1256,4 @@ please see themes_device_defaults.xml. <item name="colorPrimaryDark">@color/material_blue_grey_950</item> <item name="colorAccent">@color/material_deep_teal_500</item> </style> - - <!-- TODO: Spacer to be removed from here and public.xml --> - <style name="__removed" /> </resources> |