Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7

Browse Source 
am: bc176c4fbf

* commit 'bc176c4fbf3ab075343699f57c5fc2583549e865':
  Content description for FloatingToobar overflow.

Change-Id: Ic8ab8de6fcb433e26e811f87df3ab99e93dc054c
This commit is contained in:
Phil Weaver
2016-05-17 17:22:01 +00:00
committed by android-build-merger
parent 1110d6375a bc176c4fbf
commit c0a46cf445
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/widget/FloatingToolbar.java
View File

@@ -899,6 +899,8 @@ public final class FloatingToolbar {
mOverflowPanel.setAlpha(1); mOverflowPanel.setAlpha(1);
mOverflowPanel.setVisibility(View.VISIBLE); mOverflowPanel.setVisibility(View.VISIBLE);
mOverflowButton.setImageDrawable(mArrow); mOverflowButton.setImageDrawable(mArrow);
mOverflowButton.setContentDescription(mContext.getString(
R.string.floating_toolbar_close_overflow_description));
// Update x-coordinates depending on RTL state. // Update x-coordinates depending on RTL state.
if (isRTL()) { if (isRTL()) {
@@ -940,6 +942,8 @@ public final class FloatingToolbar {
mOverflowPanel.setAlpha(0); mOverflowPanel.setAlpha(0);
mOverflowPanel.setVisibility(View.INVISIBLE); mOverflowPanel.setVisibility(View.INVISIBLE);
mOverflowButton.setImageDrawable(mOverflow); mOverflowButton.setImageDrawable(mOverflow);
mOverflowButton.setContentDescription(mContext.getString(
R.string.floating_toolbar_open_overflow_description));
if (hasOverflow()) { if (hasOverflow()) {
// Update x-coordinates depending on RTL state. // Update x-coordinates depending on RTL state.

2
core/res/res/values/symbols.xml
View File

@@ -2322,6 +2322,8 @@
<java-symbol type="layout" name="floating_popup_overflow_list_item" /> <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_image_list_item" />
<java-symbol type="layout" name="floating_popup_overflow_button" /> <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_height" />
<java-symbol type="dimen" name="floating_toolbar_menu_button_side_padding" /> <java-symbol type="dimen" name="floating_toolbar_menu_button_side_padding" />
<java-symbol type="dimen" name="floating_toolbar_overflow_side_padding" /> <java-symbol type="dimen" name="floating_toolbar_overflow_side_padding" />