DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge "BottomNavigationView javadoc fix up." into nyc-mr1-dev

Browse Source 
GitOrigin-RevId=498c267573ddbdef66271e144af6b006c4d74742

PiperOrigin-RevId: 140564800
This commit is contained in:
Aurimas Liutikas 2016-11-30 05:14:52 +00:00 committed by Travis Collins
parent d4461c00eb
commit f8ecb8dded
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/android/support/design/internal/BottomNavigationMenuView.java
View File

@ -177,9 +177,9 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView {
}
/**
* 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 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView {
/**
* 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 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView {
}
/**
* 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 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView {
/**
* 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 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView {
}
/**
* 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;

8
src/android/support/design/widget/BottomNavigationView.java
View File

@ -234,10 +234,13 @@ public class BottomNavigationView extends FrameLayout {
}
/**
* 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 @@ public class BottomNavigationView extends FrameLayout {
}
/**
* 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()
*