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

Commit 85085343 authored by Alan Viverette's avatar Alan Viverette
Browse files

Add content description to Toolbar collapse button 

BUG: 17722111
Change-Id: If6caa8bc61b0d178648952c419591380f4edf4ba
parent 31b76b66

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ package android { 
    field public static final int closeIcon = 16843905; // 0x1010481

    field public static final int codes = 16843330; // 0x1010242

    field public static final int collapseColumns = 16843083; // 0x101014b

    field public static final int collapseContentDescription = 16844034; // 0x1010502

    field public static final int color = 16843173; // 0x10101a5

    field public static final int colorAccent = 16843829; // 0x1010435

    field public static final int colorActivatedHighlight = 16843664; // 0x1010390

core/java/android/widget/Toolbar.java

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ public class Toolbar extends ViewGroup { 
    private ImageView mLogoView;



    private Drawable mCollapseIcon;

    private CharSequence mCollapseDescription;

    private ImageButton mCollapseButtonView;

    View mExpandedActionView;
@@ -238,6 +239,7 @@ public class Toolbar extends ViewGroup { 
        }



        mCollapseIcon = a.getDrawable(R.styleable.Toolbar_collapseIcon);

        mCollapseDescription = a.getText(R.styleable.Toolbar_collapseContentDescription);



        final CharSequence title = a.getText(R.styleable.Toolbar_title);

        if (!TextUtils.isEmpty(title)) {
@@ -998,6 +1000,7 @@ public class Toolbar extends ViewGroup { 
        if (mCollapseButtonView == null) {

            mCollapseButtonView = new ImageButton(getContext(), null, 0, mNavButtonStyle);

            mCollapseButtonView.setImageDrawable(mCollapseIcon);

            mCollapseButtonView.setContentDescription(mCollapseDescription);

            final LayoutParams lp = generateDefaultLayoutParams();

            lp.gravity = Gravity.START | (mButtonGravity & Gravity.VERTICAL_GRAVITY_MASK);

            lp.mViewType = LayoutParams.EXPANDED;

core/res/res/layout/alert_dialog_material.xml

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ 
        android:paddingStart="12dp"

        android:paddingEnd="12dp"

        android:paddingTop="8dp"

        android:paddingBottom="8dp">

        android:paddingBottom="8dp"

        android:gravity="bottom">

        <Button android:id="@+id/button3"

            style="?attr/buttonBarNeutralButtonStyle"

            android:layout_width="wrap_content"

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -7460,7 +7460,10 @@ 
            <!-- Push object to the bottom of its container, not changing its size. -->

            <flag name="bottom" value="0x50" />

        </attr>

        <!-- Icon drawable to use for the collapse button. -->

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

        <!-- Text to set as the content description for the collapse button. -->

        <attr name="collapseContentDescription" format="string" />

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

             shown by widgets in the toolbar. -->

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

core/res/res/values/public.xml

+7 −0
Original line number Diff line number Diff line
@@ -2589,6 +2589,13 @@ 


    <!-- @hide -->

    <public-padding type="attr" name="private_resource_pad" end="0x01010500" />



    <!-- ===============================================================

         Resources added in version 22 of the platform

         =============================================================== -->

    <eat-comment />



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

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



</resources>