diff options
| -rw-r--r-- | core/java/android/widget/Toolbar.java | 12 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 6 |
2 files changed, 17 insertions, 1 deletions
diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java index f211b32b0f1f..ece8aa45398c 100644 --- a/core/java/android/widget/Toolbar.java +++ b/core/java/android/widget/Toolbar.java @@ -679,6 +679,8 @@ public class Toolbar extends ViewGroup { * as screen readers or tooltips. * * @return The navigation button's content description + * + * @attr ref android.R.styleable#Toolbar_navigationContentDescription */ @Nullable public CharSequence getNavigationContentDescription() { @@ -692,6 +694,8 @@ public class Toolbar extends ViewGroup { * * @param resId Resource ID of a content description string to set, or 0 to * clear the description + * + * @attr ref android.R.styleable#Toolbar_navigationContentDescription */ public void setNavigationContentDescription(int resId) { setNavigationContentDescription(resId != 0 ? getContext().getText(resId) : null); @@ -704,6 +708,8 @@ public class Toolbar extends ViewGroup { * * @param description Content description to set, or <code>null</code> to * clear the content description + * + * @attr ref android.R.styleable#Toolbar_navigationContentDescription */ public void setNavigationContentDescription(@Nullable CharSequence description) { if (!TextUtils.isEmpty(description)) { @@ -725,6 +731,8 @@ public class Toolbar extends ViewGroup { * tooltips.</p> * * @param resId Resource ID of a drawable to set + * + * @attr ref android.R.styleable#Toolbar_navigationIcon */ public void setNavigationIcon(int resId) { setNavigationIcon(getContext().getDrawable(resId)); @@ -741,6 +749,8 @@ public class Toolbar extends ViewGroup { * tooltips.</p> * * @param icon Drawable to set, may be null to clear the icon + * + * @attr ref android.R.styleable#Toolbar_navigationIcon */ public void setNavigationIcon(@Nullable Drawable icon) { if (icon != null) { @@ -761,6 +771,8 @@ public class Toolbar extends ViewGroup { * Return the current drawable used as the navigation icon. * * @return The navigation icon drawable + * + * @attr ref android.R.styleable#Toolbar_navigationIcon */ @Nullable public Drawable getNavigationIcon() { diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 9edcca2feb03..a798d2e78a87 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -7318,8 +7318,12 @@ <!-- Reference to a theme that should be used to inflate popups shown by widgets in the toolbar. --> <attr name="popupTheme" format="reference" /> + <!-- Icon drawable to use for the navigation button located at + the start of the toolbar. --> <attr name="navigationIcon" format="reference" /> - <attr name="navigationContentDescription" format="string|reference" /> + <!-- Text to set as the content description for the navigation button + located at the start of the toolbar. --> + <attr name="navigationContentDescription" format="string" /> </declare-styleable> <declare-styleable name="Toolbar_LayoutParams"> |