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

Commit 10f6e97b authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 11d6a547: am 11dbd68d: am 290f45f5: Merge "Add popupTheme attr, propagate... 

am 11d6a547: am 11dbd68d: am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev

* commit '11d6a5470fb5315a294bc1f2c50bf4232382b58a':
  Add popupTheme attr, propagate from ActionBar to ToolBar
parents b4e04203 7b689aa6

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -948,6 +948,7 @@ package android { 
    field public static final int popupKeyboard = 16843331; // 0x1010243

    field public static final int popupLayout = 16843323; // 0x101023b

    field public static final int popupMenuStyle = 16843520; // 0x1010300

    field public static final int popupTheme = 16843951; // 0x10104af

    field public static final int popupWindowStyle = 16842870; // 0x1010076

    field public static final int port = 16842793; // 0x1010029

    field public static final int positiveButtonText = 16843253; // 0x10101f5

core/java/android/widget/Toolbar.java

+2 −3
Original line number Diff line number Diff line
@@ -233,10 +233,9 @@ public class Toolbar extends ViewGroup { 
        if (!TextUtils.isEmpty(subtitle)) {

            setSubtitle(subtitle);

        }

        a.recycle();



        mPopupContext = context;

        mPopupTheme = 0;

        setPopupTheme(a.getResourceId(R.styleable.Toolbar_popupTheme, 0));

        a.recycle();

    }



    /**

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

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ import android.os.Parcelable; 
import android.text.TextUtils;

import android.util.Log;

import android.util.SparseArray;

import android.util.TypedValue;

import android.view.ContextThemeWrapper;

import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.Menu;
@@ -154,6 +156,11 @@ public class ToolbarWidgetWrapper implements DecorToolbar { 
                mToolbar.setSubtitleTextAppearance(mToolbar.getContext(), subtitleTextStyle);

            }



            final int popupTheme = a.getResourceId(R.styleable.ActionBar_popupTheme, 0);

            if (popupTheme != 0) {

                mToolbar.setPopupTheme(popupTheme);

            }



            a.recycle();

        }

core/res/res/values/attrs.xml

+6 −0
Original line number Diff line number Diff line
@@ -6896,6 +6896,9 @@ 
        <attr name="contentInsetRight" format="dimension" />

        <!-- Elevation for the action bar itself -->

        <attr name="elevation" />

        <!-- Reference to a theme that should be used to inflate popups

             shown by widgets in the action bar. -->

        <attr name="popupTheme" />

    </declare-styleable>



    <declare-styleable name="ActionMode">
@@ -7184,6 +7187,9 @@ 
            <flag name="bottom" value="0x50" />

        </attr>

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

        <!-- Reference to a theme that should be used to inflate popups

             shown by widgets in the toolbar. -->

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

    </declare-styleable>



    <declare-styleable name="Toolbar_LayoutParams">

core/res/res/values/public.xml

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

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

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

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



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