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

Merge "Update EditText.setEllipsize JavaDoc" into nyc-dev

Browse Source 
am: 15dfbdd0ea

* commit '15dfbdd0eaf266c49aac07ba127ad28fa1945c95':
  Update EditText.setEllipsize JavaDoc
This commit is contained in:
Siyamed Sinir
2016-03-03 18:47:21 +00:00
committed by android-build-merger
parent 290831f79d 15dfbdd0ea
commit ea87a00927
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/EditText.java
View File

@@ -117,6 +117,16 @@ public class EditText extends TextView {
Selection.extendSelection(getText(), index);
}
/**
* Causes words in the text that are longer than the view's width to be ellipsized instead of
* broken in the middle. {@link TextUtils.TruncateAt#MARQUEE
* TextUtils.TruncateAt#MARQUEE} is not supported.
*
* @param ellipsis Type of ellipsis to be applied.
* @throws IllegalArgumentException When the value of <code>ellipsis</code> parameter is
* {@link TextUtils.TruncateAt#MARQUEE}.
* @see TextView#setEllipsize(TextUtils.TruncateAt)
*/
@Override
public void setEllipsize(TextUtils.TruncateAt ellipsis) {
if (ellipsis == TextUtils.TruncateAt.MARQUEE) {

2
core/java/android/widget/TextView.java
View File

@@ -7888,7 +7888,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
/**
* Causes words in the text that are longer than the view is wide
* Causes words in the text that are longer than the view's width
* to be ellipsized instead of broken in the middle. You may also
* want to {@link #setSingleLine} or {@link #setHorizontallyScrolling}
* to constrain the text to a single line. Use <code>null</code>