Merge "Fix broken javadoc." (8fca21d0) · Commits · e / os / android_frameworks_base

core/java/android/animation/AnimatorListenerAdapter.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+5 −3

Original line number	Diff line number	Diff line
		@@ -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() {

+1 −1

Original line number	Diff line number	Diff line
		@@ -478,7 +478,7 @@ public class NotificationTest extends Activity {
		}
		}

		@Override
		@Override
		protected void onPrepareDialog(int id, Dialog dialog) {
		switch(id) {
		case PROGRESS_DIALOG: