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

am 2bc20751: am cce43873: am e1e5fb58: Merge "Fix design lib\'s attribute doc references" into lmp-mr1-ub-dev

Browse Source 
* commit '2bc20751d0c85fa830aaba3bf8fd21acb671746a':
  Fix design lib's attribute doc references

GitOrigin-RevId=06819f8069d967e56c28bf1cfdf7778dffbcdb68

PiperOrigin-RevId: 140548176
This commit is contained in:
Chris Banes 2016-11-30 01:14:04 +00:00 committed by Travis Collins
parent 39a893061c
commit afb9c19ed0
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/android/support/design/widget/AppBarLayout.java
View File

@ -500,7 +500,7 @@ public class AppBarLayout extends LinearLayout {
*
* @see #getScrollFlags()
*
* @attr ref android.support.design.R.styleable.AppBarLayout_LayoutParams_layout_scrollFlags
* @attr ref android.support.design.R.styleable#AppBarLayout_LayoutParams_layout_scrollFlags
*/
public void setScrollFlags(@ScrollFlags int flags) {
mScrollFlags = flags;
@ -511,7 +511,7 @@ public class AppBarLayout extends LinearLayout {
*
* @see #setScrollFlags(int)
*
* @attr ref android.support.design.R.styleable.AppBarLayout_LayoutParams_layout_scrollFlags
* @attr ref android.support.design.R.styleable#AppBarLayout_LayoutParams_layout_scrollFlags
*/
@ScrollFlags
public int getScrollFlags() {
@ -524,7 +524,7 @@ public class AppBarLayout extends LinearLayout {
*
* @param interpolator the interpolator to use, or null to use normal 1-to-1 scrolling.
*
* @attr ref android.support.design.R.styleable.AppBarLayout_LayoutParams_layout_scrollInterpolator
* @attr ref android.support.design.R.styleable#AppBarLayout_LayoutParams_layout_scrollInterpolator
* @see #getScrollInterpolator()
*/
public void setScrollInterpolator(Interpolator interpolator) {
@ -535,7 +535,7 @@ public class AppBarLayout extends LinearLayout {
* Returns the {@link Interpolator} being used for scrolling the view associated with this
* {@link LayoutParams}. Null indicates 'normal' 1-to-1 scrolling.
*
* @attr ref android.support.design.R.styleable.AppBarLayout_LayoutParams_layout_scrollInterpolator
* @attr ref android.support.design.R.styleable#AppBarLayout_LayoutParams_layout_scrollInterpolator
* @see #setScrollInterpolator(Interpolator)
*/
public Interpolator getScrollInterpolator() {
@ -942,8 +942,6 @@ public class AppBarLayout extends LinearLayout {
* Set the distance that this view should overlap any {@link AppBarLayout}.
*
* @param overlayTop the distance in px
*
* @attr ref android.support.design.R.styleable.ScrollingViewBehavior_LayoutParams_layout_overlapTop
*/
public void setOverlayTop(int overlayTop) {
mOverlayTop = overlayTop;
@ -951,8 +949,6 @@ public class AppBarLayout extends LinearLayout {
/**
* Returns the distance that this view should overlap any {@link AppBarLayout}.
*
* @attr ref android.support.design.R.styleable.ScrollingViewBehavior_LayoutParams_layout_overlapTop
*/
public int getOverlayTop() {
return mOverlayTop;

4
src/android/support/design/widget/TabLayout.java
View File

@ -100,7 +100,6 @@ public class TabLayout extends HorizontalScrollView {
* labels and a larger number of tabs. They are best used for browsing contexts in touch
* interfaces when users don’t need to directly compare the tab labels.
*
* @attr android.support.design.R.attr.tabMode
* @see #setTabMode(int)
* @see #getTabMode()
*/
@ -111,7 +110,6 @@ public class TabLayout extends HorizontalScrollView {
* quick pivots between tabs. The maximum number of tabs is limited by the view’s width.
* Fixed tabs have equal width, based on the widest tab label.
*
* @attr android.support.design.R.attr.tabMode
* @see #setTabMode(int)
* @see #getTabMode()
*/
@ -128,7 +126,6 @@ public class TabLayout extends HorizontalScrollView {
* Gravity used to fill the {@link TabLayout} as much as possible. This option only takes effect
* when used with {@link #MODE_FIXED}.
*
* @attr android.support.design.R.attr.tabGravity
* @see #setTabGravity(int)
* @see #getTabGravity()
*/
@ -137,7 +134,6 @@ public class TabLayout extends HorizontalScrollView {
/**
* Gravity used to lay out the tabs in the center of the {@link TabLayout}.
*
* @attr android.support.design.R.attr.tabGravity
* @see #setTabGravity(int)
* @see #getTabGravity()
*/

2
src/android/support/design/widget/TextInputLayout.java
View File

@ -246,8 +246,6 @@ public class TextInputLayout extends LinearLayout {
* Whether the error functionality is enabled or not in this layout. Enabling this
* functionality before setting an error message via {@link #setError(CharSequence)}, will mean
* that this layout will not change size when an error is displayed.
*
* @attr R.attr.errorEnabled
*/
public void setErrorEnabled(boolean enabled) {
if (mErrorEnabled != enabled) {