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

am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev

Browse Source 
* commit '7a0ae7ed31a9e7e296c549dfbf035bf4270be69c':
  Add content description to Toolbar collapse button
This commit is contained in:
Alan Viverette
2014-10-29 22:51:47 +00:00
committed by Android Git Automerger
parent 34964701e0 7a0ae7ed31
commit 73ab31f610
7 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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

3
core/java/android/widget/Toolbar.java
View File

@@ -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;

3
core/res/res/layout/alert_dialog_material.xml
View File

@@ -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"

3
core/res/res/values/attrs.xml
View File

@@ -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" />

7
core/res/res/values/public.xml
View File

@@ -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>

3
core/res/res/values/strings.xml
View File

@@ -4902,4 +4902,7 @@
<!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
<string name="zen_mode_forever">Indefinitely</string>
<!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
<string name="toolbar_collapse_description">Collapse</string>
</resources>

1
core/res/res/values/styles.xml
View File

@@ -1218,6 +1218,7 @@ please see styles_device_defaults.xml.
<item name="buttonGravity">top</item>
<item name="navigationButtonStyle">@style/Widget.Toolbar.Button.Navigation</item>
<item name="collapseIcon">?attr/homeAsUpIndicator</item>
<item name="collapseContentDescription">@string/toolbar_collapse_description</item>
<item name="contentInsetStart">16dp</item>
<item name="touchscreenBlocksFocus">true</item>
</style>