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

Commit 03720313 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 7faa69ce: am 32e9145c: am 31192ba8: Merge "Add xml attributes to Toolbar... 

am 7faa69ce: am 32e9145c: am 31192ba8: Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev

* commit '7faa69ced32f3f3ce0f8ec3143f6d90d24b0dfc3':
  Add xml attributes to Toolbar for navigation icon
parents 1be18d56 06086bc3

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -906,6 +906,8 @@ package android { 
    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int name = 16842755; // 0x1010003

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationContentDescription = 16843970; // 0x10104c2

    field public static final int navigationIcon = 16843969; // 0x10104c1

    field public static final int navigationMode = 16843471; // 0x10102cf

    field public static final int negativeButtonText = 16843254; // 0x10101f6

    field public static final int nestedScrollingEnabled = 16843830; // 0x1010436

core/java/android/widget/Toolbar.java

+10 −0
Original line number Diff line number Diff line
@@ -244,6 +244,16 @@ public class Toolbar extends ViewGroup { 
        // Set the default context, since setPopupTheme() may be a no-op.

        mPopupContext = mContext;

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



        final Drawable navIcon = a.getDrawable(R.styleable.Toolbar_navigationIcon);

        if (navIcon != null) {

            setNavigationIcon(navIcon);

            final CharSequence navDesc = a.getText(

                    R.styleable.Toolbar_navigationContentDescription);

            if (!TextUtils.isEmpty(navDesc)) {

                setNavigationContentDescription(navDesc);

            }

        }

        a.recycle();

    }

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -7318,6 +7318,8 @@ 
        <!-- Reference to a theme that should be used to inflate popups

             shown by widgets in the toolbar. -->

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

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

        <attr name="navigationContentDescription" format="string|reference" />

    </declare-styleable>



    <declare-styleable name="Toolbar_LayoutParams">

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -2280,6 +2280,8 @@ 
  <public type="attr" name="reparentWithOverlay" />

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

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

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

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



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