diff options
| author | Romain Guy <romainguy@google.com> | 2010-02-24 18:00:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-24 18:00:01 -0800 |
| commit | 21a20a39aeb083335fabd1d1098a73977131ec3f (patch) | |
| tree | a4f239cb02ad4610a8b4da3cad4ead41d9d8ff84 /core | |
| parent | a09bb0d218d2ddb73b92b6dd4415456c9105cde8 (diff) | |
| parent | dcc490f20103a4bbd879ea040ce67779d211c2d7 (diff) | |
| download | frameworks_base-21a20a39aeb083335fabd1d1098a73977131ec3f.zip frameworks_base-21a20a39aeb083335fabd1d1098a73977131ec3f.tar.gz frameworks_base-21a20a39aeb083335fabd1d1098a73977131ec3f.tar.bz2 | |
Merge "Fix the build."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 4 | ||||
| -rw-r--r-- | core/java/android/widget/TextView.java | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index aac1068..d05416d 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -1068,6 +1068,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** * {@inheritDoc} + * + * @hide */ @Override public void dispatchStartTemporaryDetach() { @@ -1081,6 +1083,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** * {@inheritDoc} + * + * @hide */ @Override public void dispatchFinishTemporaryDetach() { diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index cb44fa8..951563a 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -6372,6 +6372,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener mBlink.postAtTime(mBlink, mShowCursor + BLINK); } + /** + * @hide + */ @Override public void dispatchFinishTemporaryDetach() { mDispatchTemporaryDetach = true; |