Merge "BottomNavigationView javadoc fix up." into nyc-mr1-dev
diff --git a/design/src/android/support/design/internal/BottomNavigationMenuView.java b/design/src/android/support/design/internal/BottomNavigationMenuView.java
index e144fae..e6ae08f 100644
--- a/design/src/android/support/design/internal/BottomNavigationMenuView.java
+++ b/design/src/android/support/design/internal/BottomNavigationMenuView.java
@@ -177,9 +177,9 @@
}
/**
- * Set the tint which is applied to the menu items' icons.
+ * Sets the tint which is applied to the menu items' icons.
*
- * @param tint the tint to apply.
+ * @param tint the tint to apply
*/
public void setIconTintList(ColorStateList tint) {
mItemIconTint = tint;
@@ -192,7 +192,7 @@
/**
* Returns the tint which is applied to menu items' icons.
*
- * @return The ColorStateList that is used to tint menu items' icons.
+ * @return the ColorStateList that is used to tint menu items' icons
*/
@Nullable
public ColorStateList getIconTintList() {
@@ -200,7 +200,7 @@
}
/**
- * Set the text color to be used on menu items.
+ * Sets the text color to be used on menu items.
*
* @param color the ColorStateList used for menu items' text.
*/
@@ -215,15 +215,16 @@
/**
* Returns the text color used on menu items.
*
- * @return the ColorStateList used for menu items' text.
+ * @return the ColorStateList used for menu items' text
*/
public ColorStateList getItemTextColor() {
return mItemTextColor;
}
/**
- * Sets the resource id to be used for item background.
- * @param background the resource id of the background.
+ * Sets the resource ID to be used for item background.
+ *
+ * @param background the resource ID of the background
*/
public void setItemBackgroundRes(int background) {
mItemBackgroundRes = background;
@@ -234,9 +235,9 @@
}
/**
- * Returns the background resource of the menu items.
+ * Returns the resource ID for the background of the menu items.
*
- * @return the resource id of the background.
+ * @return the resource ID for the background
*/
public int getItemBackgroundRes() {
return mItemBackgroundRes;
diff --git a/design/src/android/support/design/widget/BottomNavigationView.java b/design/src/android/support/design/widget/BottomNavigationView.java
index 352e136..e3a81b3 100644
--- a/design/src/android/support/design/widget/BottomNavigationView.java
+++ b/design/src/android/support/design/widget/BottomNavigationView.java
@@ -234,10 +234,13 @@
}
/**
- * Returns the text color used on menu items.
+ * Returns colors used for the different states (normal, selected, focused, etc.) of the menu
+ * item text.
*
* @see #setItemTextColor(ColorStateList)
*
+ * @return the ColorStateList of colors used for the different states of the menu items text.
+ *
* @attr ref R.styleable#BottomNavigationView_itemTextColor
*/
@Nullable
@@ -246,7 +249,8 @@
}
/**
- * Set the text color to be used on menu items.
+ * Set the colors to use for the different states (normal, selected, focused, etc.) of the menu
+ * item text.
*
* @see #getItemTextColor()
*