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

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

Merge "Make overlapAnchor public, make ActionBar spinner overlap"

parents 3d187c2e e178c93f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -859,6 +859,7 @@ package android { 
    field public static final int overScrollFooter = 16843459; // 0x10102c3

    field public static final int overScrollHeader = 16843458; // 0x10102c2

    field public static final int overScrollMode = 16843457; // 0x10102c1

    field public static final int overlapAnchor = 16843876; // 0x1010464

    field public static final int overridesImplicitlyEnabledSubtype = 16843682; // 0x10103a2

    field public static final int packageNames = 16843649; // 0x1010381

    field public static final int padding = 16842965; // 0x10100d5

core/java/com/android/internal/widget/ToolbarWidgetWrapper.java

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ public class ToolbarWidgetWrapper implements DecorToolbar { 


    private void ensureSpinner() {

        if (mSpinner == null) {

            mSpinner = new Spinner(getContext());

            mSpinner = new Spinner(getContext(), null, R.attr.actionDropDownStyle);

            Toolbar.LayoutParams lp = new Toolbar.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,

                    ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.START | Gravity.CENTER_VERTICAL);

            mSpinner.setLayoutParams(lp);

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -3870,8 +3870,11 @@ 
        <attr name="inputType" />

    </declare-styleable>

    <declare-styleable name="PopupWindow">

        <!-- The background to use for the popup window. -->

        <attr name="popupBackground" format="reference|color" />

        <!-- The animation style to use for the popup window. -->

        <attr name="popupAnimationStyle" format="reference" />

        <!-- Whether the popup window should overlap its anchor view. -->

        <attr name="overlapAnchor" format="boolean" />

    </declare-styleable>

    <declare-styleable name="ViewAnimator">

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2189,6 +2189,7 @@ 
  <public type="attr" name="searchKeyphrase" />

  <public type="attr" name="searchKeyphraseSupportedLocales" />

  <public type="attr" name="windowTransitionBackgroundFadeDuration" />

  <public type="attr" name="overlapAnchor" />



  <public-padding type="dimen" name="l_resource_pad" end="0x01050010" />

core/res/res/values/styles_material.xml

+1 −0
Original line number Diff line number Diff line
@@ -624,6 +624,7 @@ please see styles_device_defaults.xml. 


    <style name="Widget.Material.Spinner.DropDown.ActionBar">

        <item name="background">@drawable/spinner_background_material</item>

        <item name="overlapAnchor">true</item>

    </style>



    <style name="Widget.Material.TabWidget" parent="Widget.TabWidget">