diff options
-rw-r--r-- | core/java/android/animation/AnimatorListenerAdapter.java | 8 | ||||
-rw-r--r-- | core/java/android/app/LoaderManagingFragment.java | 2 | ||||
-rw-r--r-- | core/java/android/view/View.java | 8 | ||||
-rw-r--r-- | docs/html/guide/topics/ui/dialogs.jd | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/core/java/android/animation/AnimatorListenerAdapter.java b/core/java/android/animation/AnimatorListenerAdapter.java index 6182389..e5d70a4 100644 --- a/core/java/android/animation/AnimatorListenerAdapter.java +++ b/core/java/android/animation/AnimatorListenerAdapter.java @@ -24,28 +24,28 @@ package android.animation; public abstract class AnimatorListenerAdapter implements Animator.AnimatorListener { /** - * {@inheritdoc} + * {@inheritDoc} */ @Override public void onAnimationCancel(Animator animation) { } /** - * {@inheritdoc} + * {@inheritDoc} */ @Override public void onAnimationEnd(Animator animation) { } /** - * {@inheritdoc} + * {@inheritDoc} */ @Override public void onAnimationRepeat(Animator animation) { } /** - * {@inheritdoc} + * {@inheritDoc} */ @Override public void onAnimationStart(Animator animation) { diff --git a/core/java/android/app/LoaderManagingFragment.java b/core/java/android/app/LoaderManagingFragment.java index 5d417a0..af71170 100644 --- a/core/java/android/app/LoaderManagingFragment.java +++ b/core/java/android/app/LoaderManagingFragment.java @@ -148,7 +148,7 @@ public abstract class LoaderManagingFragment<D> extends Fragment mStarted = false; } - /** TO DO: This needs to be turned into a retained fragment. + /* TO DO: This needs to be turned into a retained fragment. @Override public Object onRetainNonConfigurationInstance() { // Pass the loader along to the next guy diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index d04007c..00efa90 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5286,7 +5286,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility * The amount that the view is scaled in x around the pivot point, as a proportion of * the view's unscaled width. A value of 1, the default, means that no scaling is applied. * - * @default 1.0f + * <p>By default, this is 1.0f. + * * @see #getPivotX() * @see #getPivotY() * @return The scaling factor. @@ -5318,7 +5319,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility * The amount that the view is scaled in y around the pivot point, as a proportion of * the view's unscaled height. A value of 1, the default, means that no scaling is applied. * - * @default 1.0f + * <p>By default, this is 1.0f. + * * @see #getPivotX() * @see #getPivotY() * @return The scaling factor. @@ -5427,7 +5429,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility * The opacity of the view. This is a value from 0 to 1, where 0 means the view is * completely transparent and 1 means the view is completely opaque. * - * @default 1.0f + * <p>By default this is 1.0f. * @return The opacity of the view. */ public float getAlpha() { diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd index d047b2d..f47a709 100644 --- a/docs/html/guide/topics/ui/dialogs.jd +++ b/docs/html/guide/topics/ui/dialogs.jd @@ -478,7 +478,7 @@ public class NotificationTest extends Activity { } } - @Override + @Override protected void onPrepareDialog(int id, Dialog dialog) { switch(id) { case PROGRESS_DIALOG: |