diff options
| author | Gilles Debunne <debunne@google.com> | 2011-11-29 10:09:25 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-29 10:09:25 -0800 |
| commit | c273cd318d8bb45c22a914ba88d4cb4dd94a768e (patch) | |
| tree | a710a07252cb36a3907542b1afb9b20bd1f46294 /core/java/android/widget/TextView.java | |
| parent | e29e4d2adef21aa54b2ae4bf225e3492bc3735c3 (diff) | |
| parent | cdfab19bf761eb6faaae119ab13b5a9de855770c (diff) | |
| download | frameworks_base-c273cd318d8bb45c22a914ba88d4cb4dd94a768e.zip frameworks_base-c273cd318d8bb45c22a914ba88d4cb4dd94a768e.tar.gz frameworks_base-c273cd318d8bb45c22a914ba88d4cb4dd94a768e.tar.bz2 | |
Merge "Restoring mLayout has private in TextView"
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index aa12278..c24d928 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -11470,13 +11470,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener private boolean mUserSetTextScaleX; private final Paint mHighlightPaint; private int mHighlightColor = 0x6633B5E5; - /** - * This is temporarily visible to fix bug 3085564 in webView. Do not rely on - * this field being protected. Will be restored as private when lineHeight - * feature request 3215097 is implemented - * @hide - */ - protected Layout mLayout; + private Layout mLayout; private long mShowCursor; private Blink mBlink; |