summaryrefslogtreecommitdiffstats
path: root/core/java/android/text/Layout.java
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2011-02-01 10:09:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-01 10:09:29 -0800
commit15f16e3f860b28ef0767b08ae8d86dc08b6aac3b (patch)
tree7fc63c8967b4020b532ba1e08f7a4297b650d3dd /core/java/android/text/Layout.java
parent87793907c4c6cf6c0e96628c1b2d2555a5290af9 (diff)
parent6538329258ee01b27586d8b0e46e96160d719a68 (diff)
downloadframeworks_base-15f16e3f860b28ef0767b08ae8d86dc08b6aac3b.zip
frameworks_base-15f16e3f860b28ef0767b08ae8d86dc08b6aac3b.tar.gz
frameworks_base-15f16e3f860b28ef0767b08ae8d86dc08b6aac3b.tar.bz2
am 65383292: am 8f8aac5e: Merge "Pixel were missing on the last line of text when using MaxLines." into honeycomb
* commit '6538329258ee01b27586d8b0e46e96160d719a68': Pixel were missing on the last line of text when using MaxLines.
Diffstat (limited to 'core/java/android/text/Layout.java')
-rw-r--r--core/java/android/text/Layout.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index 3fe4f4c..8700af8 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1764,4 +1764,15 @@ public abstract class Layout {
new Directions(new int[] { 0, RUN_LENGTH_MASK });
/* package */ static final Directions DIRS_ALL_RIGHT_TO_LEFT =
new Directions(new int[] { 0, RUN_LENGTH_MASK | RUN_RTL_FLAG });
+
+ /**
+ * Inform this layout that not all of its lines will be displayed, because a maximum number of
+ * lines has been set on the associated TextView.
+ *
+ * A non positive value means that all lines are displayed.
+ *
+ * @param line line number of the last visible line (line numbers start at 1 for the first line)
+ * @hide
+ */
+ public void setMaximumVisibleLineCount(int line) {}
}