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

Commit 43141e33 authored by Phil Weaver's avatar Phil Weaver Committed by Android (Google) Code Review
Browse files

Merge "Content description for FloatingToobar overflow." into nyc-dev

parents 690c2ea1 1d4e1834

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

+4 −0
Original line number Diff line number Diff line
@@ -899,6 +899,8 @@ public final class FloatingToolbar { 
                mOverflowPanel.setAlpha(1);

                mOverflowPanel.setVisibility(View.VISIBLE);

                mOverflowButton.setImageDrawable(mArrow);

                mOverflowButton.setContentDescription(mContext.getString(

                        R.string.floating_toolbar_close_overflow_description));



                // Update x-coordinates depending on RTL state.

                if (isRTL()) {
@@ -940,6 +942,8 @@ public final class FloatingToolbar { 
                mOverflowPanel.setAlpha(0);

                mOverflowPanel.setVisibility(View.INVISIBLE);

                mOverflowButton.setImageDrawable(mOverflow);

                mOverflowButton.setContentDescription(mContext.getString(

                        R.string.floating_toolbar_open_overflow_description));



                if (hasOverflow()) {

                    // Update x-coordinates depending on RTL state.

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2322,6 +2322,8 @@ 
  <java-symbol type="layout" name="floating_popup_overflow_list_item" />

  <java-symbol type="layout" name="floating_popup_overflow_image_list_item" />

  <java-symbol type="layout" name="floating_popup_overflow_button" />

  <java-symbol type="string" name="floating_toolbar_open_overflow_description" />

  <java-symbol type="string" name="floating_toolbar_close_overflow_description" />

  <java-symbol type="dimen" name="floating_toolbar_height" />

  <java-symbol type="dimen" name="floating_toolbar_menu_button_side_padding" />

  <java-symbol type="dimen" name="floating_toolbar_overflow_side_padding" />