Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ff0270e authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev

parents 5aaa7788 362f984d

api/current.txt

+8 −6
Original line number Diff line number Diff line
@@ -2395,7 +2395,6 @@ package android { 
    field public static final int Widget_Holo_DropDownItem_Spinner = 16973995; // 0x10300ab

    field public static final int Widget_Holo_EditText = 16973971; // 0x1030093

    field public static final int Widget_Holo_ExpandableListView = 16973972; // 0x1030094

    field public static final int Widget_Holo_FastScroll = 16974341; // 0x1030205

    field public static final int Widget_Holo_GridView = 16973973; // 0x1030095

    field public static final int Widget_Holo_HorizontalScrollView = 16973988; // 0x10300a4

    field public static final int Widget_Holo_ImageButton = 16973974; // 0x1030096
@@ -2416,7 +2415,6 @@ package android { 
    field public static final int Widget_Holo_Light_ActionMode_Inverse = 16974119; // 0x1030127

    field public static final int Widget_Holo_Light_AutoCompleteTextView = 16974011; // 0x10300bb

    field public static final int Widget_Holo_Light_Button = 16974006; // 0x10300b6

    field public static final int Widget_Holo_Light_Button_Borderless = 16974343; // 0x1030207

    field public static final int Widget_Holo_Light_Button_Borderless_Small = 16974107; // 0x103011b

    field public static final int Widget_Holo_Light_Button_Inset = 16974008; // 0x10300b8

    field public static final int Widget_Holo_Light_Button_Small = 16974007; // 0x10300b7
@@ -2430,7 +2428,6 @@ package android { 
    field public static final int Widget_Holo_Light_DropDownItem_Spinner = 16974041; // 0x10300d9

    field public static final int Widget_Holo_Light_EditText = 16974014; // 0x10300be

    field public static final int Widget_Holo_Light_ExpandableListView = 16974015; // 0x10300bf

    field public static final int Widget_Holo_Light_FastScroll = 16974344; // 0x1030208

    field public static final int Widget_Holo_Light_GridView = 16974016; // 0x10300c0

    field public static final int Widget_Holo_Light_HorizontalScrollView = 16974034; // 0x10300d2

    field public static final int Widget_Holo_Light_ImageButton = 16974017; // 0x10300c1
@@ -2454,7 +2451,6 @@ package android { 
    field public static final int Widget_Holo_Light_ScrollView = 16974033; // 0x10300d1

    field public static final int Widget_Holo_Light_SeekBar = 16974028; // 0x10300cc

    field public static final int Widget_Holo_Light_Spinner = 16974035; // 0x10300d3

    field public static final int Widget_Holo_Light_StackView = 16974345; // 0x1030209

    field public static final int Widget_Holo_Light_Tab = 16974052; // 0x10300e4

    field public static final int Widget_Holo_Light_TabWidget = 16974037; // 0x10300d5

    field public static final int Widget_Holo_Light_TextView = 16974010; // 0x10300ba
@@ -2478,7 +2474,6 @@ package android { 
    field public static final int Widget_Holo_ScrollView = 16973987; // 0x10300a3

    field public static final int Widget_Holo_SeekBar = 16973982; // 0x103009e

    field public static final int Widget_Holo_Spinner = 16973989; // 0x10300a5

    field public static final int Widget_Holo_StackView = 16974342; // 0x1030206

    field public static final int Widget_Holo_Tab = 16974051; // 0x10300e3

    field public static final int Widget_Holo_TabWidget = 16973991; // 0x10300a7

    field public static final int Widget_Holo_TextView = 16973967; // 0x103008f
@@ -2579,6 +2574,7 @@ package android { 
    field public static final int Widget_Material_Light_RatingBar_Indicator = 16974531; // 0x10302c3

    field public static final int Widget_Material_Light_RatingBar_Small = 16974532; // 0x10302c4

    field public static final int Widget_Material_Light_ScrollView = 16974533; // 0x10302c5

    field public static final int Widget_Material_Light_SearchView = 16974575; // 0x10302ef

    field public static final int Widget_Material_Light_SeekBar = 16974534; // 0x10302c6

    field public static final int Widget_Material_Light_SegmentedButton = 16974535; // 0x10302c7

    field public static final int Widget_Material_Light_Spinner = 16974537; // 0x10302c9
@@ -2606,6 +2602,7 @@ package android { 
    field public static final int Widget_Material_RatingBar_Indicator = 16974468; // 0x1030284

    field public static final int Widget_Material_RatingBar_Small = 16974469; // 0x1030285

    field public static final int Widget_Material_ScrollView = 16974470; // 0x1030286

    field public static final int Widget_Material_SearchView = 16974574; // 0x10302ee

    field public static final int Widget_Material_SeekBar = 16974471; // 0x1030287

    field public static final int Widget_Material_SegmentedButton = 16974472; // 0x1030288

    field public static final int Widget_Material_Spinner = 16974474; // 0x103028a
@@ -2641,7 +2638,12 @@ package android { 
    field public static final int Widget_Toolbar = 16974339; // 0x1030203

    field public static final int Widget_Toolbar_Button_Navigation = 16974340; // 0x1030204

    field public static final int Widget_WebView = 16973875; // 0x1030033

    field public static final int __removed = 16974559; // 0x10302df

    field public static final int __removed1 = 16974559; // 0x10302df

    field public static final int __removed3 = 16974341; // 0x1030205

    field public static final int __removed4 = 16974342; // 0x1030206

    field public static final int __removed5 = 16974343; // 0x1030207

    field public static final int __removed6 = 16974344; // 0x1030208

    field public static final int __removed7 = 16974345; // 0x1030209

    field public static final int l_resource_pad1 = 16974336; // 0x1030200

    field public static final int l_resource_pad10 = 16974327; // 0x10301f7

    field public static final int l_resource_pad11 = 16974326; // 0x10301f6

core/java/android/widget/SearchView.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

core/res/res/values/attrs.xml

+0 −6
Original line number Diff line number Diff line
@@ -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

core/res/res/values/public.xml

+9 −8
Original line number Diff line number Diff line
@@ -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" />

core/res/res/values/removed.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?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>