Add all missing @Override annotations.
Historically, we could not add @Override for certain methods due to
using older SDKs to build support library. That is no longer the case
so we can add @Override everywhere now.
Test: ./gradlew assemble assembleAndroidTest still works
Change-Id: I85e3c1157f0e253e3eab7584189f3bf95cf030e9
diff --git a/compat/ics/android/support/v4/graphics/drawable/DrawableWrapperApi14.java b/compat/ics/android/support/v4/graphics/drawable/DrawableWrapperApi14.java
index 435a76e..5b1bbc7 100644
--- a/compat/ics/android/support/v4/graphics/drawable/DrawableWrapperApi14.java
+++ b/compat/ics/android/support/v4/graphics/drawable/DrawableWrapperApi14.java
@@ -312,6 +312,7 @@
/**
* Returns the wrapped {@link Drawable}
*/
+ @Override
public final Drawable getWrappedDrawable() {
return mDrawable;
}
@@ -319,6 +320,7 @@
/**
* Sets the current wrapped {@link Drawable}
*/
+ @Override
public final void setWrappedDrawable(Drawable dr) {
if (mDrawable != null) {
mDrawable.setCallback(null);
@@ -367,6 +369,7 @@
return newDrawable(null);
}
+ @Override
public abstract Drawable newDrawable(@Nullable Resources res);
@Override
diff --git a/compat/java/android/support/v4/app/RemoteInput.java b/compat/java/android/support/v4/app/RemoteInput.java
index 2bf2f280..84dde3b 100644
--- a/compat/java/android/support/v4/app/RemoteInput.java
+++ b/compat/java/android/support/v4/app/RemoteInput.java
@@ -87,6 +87,7 @@
return mChoices;
}
+ @Override
public Set<String> getAllowedDataTypes() {
return mAllowedDataTypes;
}
diff --git a/compat/java/android/support/v4/internal/view/SupportMenuItem.java b/compat/java/android/support/v4/internal/view/SupportMenuItem.java
index 86e497f..504b579 100644
--- a/compat/java/android/support/v4/internal/view/SupportMenuItem.java
+++ b/compat/java/android/support/v4/internal/view/SupportMenuItem.java
@@ -78,6 +78,7 @@
* @see android.app.ActionBar
* @see #setActionView(View)
*/
+ @Override
void setShowAsAction(int actionEnum);
/**
@@ -98,6 +99,7 @@
* @see android.app.ActionBar
* @see #setActionView(View)
*/
+ @Override
MenuItem setShowAsActionFlags(int actionEnum);
/**
@@ -112,6 +114,7 @@
* @return This Item so additional setters can be called.
* @see #setShowAsAction(int)
*/
+ @Override
MenuItem setActionView(View view);
/**
@@ -126,6 +129,7 @@
* @return This Item so additional setters can be called.
* @see #setShowAsAction(int)
*/
+ @Override
MenuItem setActionView(int resId);
/**
@@ -135,6 +139,7 @@
* @see #setActionView(View)
* @see #setShowAsAction(int)
*/
+ @Override
View getActionView();
/**
@@ -172,6 +177,7 @@
*
* @return true if the action view was expanded, false otherwise.
*/
+ @Override
boolean expandActionView();
/**
@@ -185,6 +191,7 @@
*
* @return true if the action view was collapsed, false otherwise.
*/
+ @Override
boolean collapseActionView();
/**
@@ -196,6 +203,7 @@
* @see #SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW
* @see MenuItem.OnActionExpandListener
*/
+ @Override
boolean isActionViewExpanded();
/**
@@ -214,6 +222,7 @@
* @param contentDescription The new content description.
* @return This menu item instance for call chaining.
*/
+ @Override
SupportMenuItem setContentDescription(CharSequence contentDescription);
/**
@@ -221,6 +230,7 @@
*
* @return The content description.
*/
+ @Override
CharSequence getContentDescription();
/**
@@ -229,6 +239,7 @@
* @param tooltipText The new tooltip text.
* @return This menu item instance for call chaining.
*/
+ @Override
SupportMenuItem setTooltipText(CharSequence tooltipText);
/**
@@ -236,5 +247,6 @@
*
* @return The tooltip text.
*/
+ @Override
CharSequence getTooltipText();
}
\ No newline at end of file
diff --git a/compat/java/android/support/v4/os/ParcelableCompat.java b/compat/java/android/support/v4/os/ParcelableCompat.java
index 03051a2..663da56 100644
--- a/compat/java/android/support/v4/os/ParcelableCompat.java
+++ b/compat/java/android/support/v4/os/ParcelableCompat.java
@@ -49,14 +49,17 @@
mCallbacks = callbacks;
}
+ @Override
public T createFromParcel(Parcel in) {
return mCallbacks.createFromParcel(in, null);
}
+ @Override
public T createFromParcel(Parcel in, ClassLoader loader) {
return mCallbacks.createFromParcel(in, loader);
}
+ @Override
public T[] newArray(int size) {
return mCallbacks.newArray(size);
}
diff --git a/compat/jellybean/android/support/v4/app/NotificationCompatJellybean.java b/compat/jellybean/android/support/v4/app/NotificationCompatJellybean.java
index d27d11b..feee689 100644
--- a/compat/jellybean/android/support/v4/app/NotificationCompatJellybean.java
+++ b/compat/jellybean/android/support/v4/app/NotificationCompatJellybean.java
@@ -139,6 +139,7 @@
return b;
}
+ @Override
public Notification build() {
Notification notif = b.build();
// Merge in developer provided extras, but let the values already set
diff --git a/compat/tests/java/android/support/v4/testutils/TestUtils.java b/compat/tests/java/android/support/v4/testutils/TestUtils.java
index 0bb8e1f..e44448d 100644
--- a/compat/tests/java/android/support/v4/testutils/TestUtils.java
+++ b/compat/tests/java/android/support/v4/testutils/TestUtils.java
@@ -27,8 +27,6 @@
import android.graphics.drawable.Drawable;
import android.support.annotation.ColorInt;
import android.support.annotation.NonNull;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
import junit.framework.Assert;
diff --git a/compat/tests/java/android/support/v4/text/util/LinkifyCompatTest.java b/compat/tests/java/android/support/v4/text/util/LinkifyCompatTest.java
index 775eb1d..51bb7d0 100644
--- a/compat/tests/java/android/support/v4/text/util/LinkifyCompatTest.java
+++ b/compat/tests/java/android/support/v4/text/util/LinkifyCompatTest.java
@@ -49,6 +49,7 @@
"(test:)?[a-zA-Z0-9]+(\\.pattern)?");
private MatchFilter mMatchFilterStartWithDot = new MatchFilter() {
+ @Override
public final boolean acceptMatch(final CharSequence s, final int start, final int end) {
if (start == 0) {
return true;
@@ -63,6 +64,7 @@
};
private TransformFilter mTransformFilterUpperChar = new TransformFilter() {
+ @Override
public final String transformUrl(final Matcher match, String url) {
StringBuilder buffer = new StringBuilder();
String matchingRegion = match.group();
diff --git a/core-ui/java/android/support/v4/view/ViewPager.java b/core-ui/java/android/support/v4/view/ViewPager.java
index 4c1e497..bec05fe 100644
--- a/core-ui/java/android/support/v4/view/ViewPager.java
+++ b/core-ui/java/android/support/v4/view/ViewPager.java
@@ -2680,6 +2680,7 @@
* @return Whether this ViewPager can be scrolled in the specified direction. It will always
* return false if the specified direction is 0.
*/
+ @Override
public boolean canScrollHorizontally(int direction) {
if (mAdapter == null) {
return false;
diff --git a/core-ui/java/android/support/v4/widget/DrawerLayout.java b/core-ui/java/android/support/v4/widget/DrawerLayout.java
index 74c6bf4..8440cda 100644
--- a/core-ui/java/android/support/v4/widget/DrawerLayout.java
+++ b/core-ui/java/android/support/v4/widget/DrawerLayout.java
@@ -1330,6 +1330,7 @@
invalidate();
}
+ @Override
public void onRtlPropertiesChanged(int layoutDirection) {
resolveShadowDrawables();
}
diff --git a/core-ui/java/android/support/v4/widget/MaterialProgressDrawable.java b/core-ui/java/android/support/v4/widget/MaterialProgressDrawable.java
index 12b3a74..cad36d9 100644
--- a/core-ui/java/android/support/v4/widget/MaterialProgressDrawable.java
+++ b/core-ui/java/android/support/v4/widget/MaterialProgressDrawable.java
@@ -235,6 +235,7 @@
mRing.setAlpha(alpha);
}
+ @Override
public int getAlpha() {
return mRing.getAlpha();
}
diff --git a/core-ui/java/android/support/v4/widget/NestedScrollView.java b/core-ui/java/android/support/v4/widget/NestedScrollView.java
index 709165f..d65a528 100644
--- a/core-ui/java/android/support/v4/widget/NestedScrollView.java
+++ b/core-ui/java/android/support/v4/widget/NestedScrollView.java
@@ -312,6 +312,7 @@
// ScrollView import
+ @Override
public boolean shouldDelayChildPressedState() {
return true;
}
@@ -891,6 +892,7 @@
}
}
+ @Override
public boolean onGenericMotionEvent(MotionEvent event) {
if ((event.getSource() & InputDeviceCompat.SOURCE_CLASS_POINTER) != 0) {
switch (event.getAction()) {
diff --git a/core-utils/gingerbread/android/support/v4/graphics/drawable/RoundedBitmapDrawable.java b/core-utils/gingerbread/android/support/v4/graphics/drawable/RoundedBitmapDrawable.java
index a38afa4..d515561 100644
--- a/core-utils/gingerbread/android/support/v4/graphics/drawable/RoundedBitmapDrawable.java
+++ b/core-utils/gingerbread/android/support/v4/graphics/drawable/RoundedBitmapDrawable.java
@@ -276,6 +276,7 @@
}
}
+ @Override
public int getAlpha() {
return mPaint.getAlpha();
}
@@ -286,6 +287,7 @@
invalidateSelf();
}
+ @Override
public ColorFilter getColorFilter() {
return mPaint.getColorFilter();
}
diff --git a/core-utils/java/android/support/v4/app/TaskStackBuilder.java b/core-utils/java/android/support/v4/app/TaskStackBuilder.java
index d95e1a4..3d5e1f4 100644
--- a/core-utils/java/android/support/v4/app/TaskStackBuilder.java
+++ b/core-utils/java/android/support/v4/app/TaskStackBuilder.java
@@ -84,6 +84,7 @@
@TargetApi(16)
static class TaskStackBuilderApi16Impl extends TaskStackBuilderBaseImpl {
+ @Override
public PendingIntent getPendingIntent(Context context, Intent[] intents, int requestCode,
int flags, Bundle options) {
intents[0] = new Intent(intents[0]).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
@@ -270,6 +271,7 @@
/**
* @deprecated Use editIntentAt instead
*/
+ @Override
@Deprecated
public Iterator<Intent> iterator() {
return mIntents.iterator();
diff --git a/customtabs/tests/src/android/support/customtabs/PostMessageServiceConnectionTest.java b/customtabs/tests/src/android/support/customtabs/PostMessageServiceConnectionTest.java
index a2b1b31..c0fadae 100644
--- a/customtabs/tests/src/android/support/customtabs/PostMessageServiceConnectionTest.java
+++ b/customtabs/tests/src/android/support/customtabs/PostMessageServiceConnectionTest.java
@@ -61,6 +61,7 @@
mContext = mActivityTestRule.getActivity();
mConnection = new PostMessageServiceConnection(
new CustomTabsSessionToken(mCallback.getStub())) {
+ @Override
public void onPostMessageServiceConnected() {
mServiceConnected = true;
}
diff --git a/design/src/android/support/design/internal/BaselineLayout.java b/design/src/android/support/design/internal/BaselineLayout.java
index d2a7be4..0bfdf24 100644
--- a/design/src/android/support/design/internal/BaselineLayout.java
+++ b/design/src/android/support/design/internal/BaselineLayout.java
@@ -42,6 +42,7 @@
super(context, attrs, defStyleAttr);
}
+ @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final int count = getChildCount();
int maxWidth = 0;
diff --git a/design/src/android/support/design/internal/ForegroundLinearLayout.java b/design/src/android/support/design/internal/ForegroundLinearLayout.java
index bda83dd..6d90503 100644
--- a/design/src/android/support/design/internal/ForegroundLinearLayout.java
+++ b/design/src/android/support/design/internal/ForegroundLinearLayout.java
@@ -83,6 +83,7 @@
* @return foreground gravity.
* @see #setForegroundGravity(int)
*/
+ @Override
public int getForegroundGravity() {
return mForegroundGravity;
}
@@ -93,6 +94,7 @@
* @param foregroundGravity See {@link android.view.Gravity}
* @see #getForegroundGravity()
*/
+ @Override
public void setForegroundGravity(int foregroundGravity) {
if (mForegroundGravity != foregroundGravity) {
if ((foregroundGravity & Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK) == 0) {
@@ -144,6 +146,7 @@
*
* @param drawable The Drawable to be drawn on top of the children.
*/
+ @Override
public void setForeground(Drawable drawable) {
if (mForeground != drawable) {
if (mForeground != null) {
@@ -177,6 +180,7 @@
*
* @return A Drawable or null if no foreground was set.
*/
+ @Override
public Drawable getForeground() {
return mForeground;
}
diff --git a/design/src/android/support/design/widget/FloatingActionButton.java b/design/src/android/support/design/widget/FloatingActionButton.java
index 2ac0785..b938836 100644
--- a/design/src/android/support/design/widget/FloatingActionButton.java
+++ b/design/src/android/support/design/widget/FloatingActionButton.java
@@ -248,6 +248,7 @@
*
* @param tint the tint to apply, may be {@code null} to clear tint
*/
+ @Override
public void setBackgroundTintList(@Nullable ColorStateList tint) {
if (mBackgroundTint != tint) {
mBackgroundTint = tint;
@@ -277,6 +278,7 @@
* @param tintMode the blending mode used to apply the tint, may be
* {@code null} to clear tint
*/
+ @Override
public void setBackgroundTintMode(@Nullable PorterDuff.Mode tintMode) {
if (mBackgroundTintMode != tintMode) {
mBackgroundTintMode = tintMode;
diff --git a/exifinterface/src/android/support/media/ExifInterface.java b/exifinterface/src/android/support/media/ExifInterface.java
index 4ae0312..c4d602d 100644
--- a/exifinterface/src/android/support/media/ExifInterface.java
+++ b/exifinterface/src/android/support/media/ExifInterface.java
@@ -3614,6 +3614,7 @@
return skipped;
}
+ @Override
public int readUnsignedShort() throws IOException {
mPosition += 2;
if (mPosition > mLength) {
@@ -3692,10 +3693,12 @@
mByteOrder = byteOrder;
}
+ @Override
public void write(byte[] bytes) throws IOException {
mOutputStream.write(bytes);
}
+ @Override
public void write(byte[] bytes, int offset, int length) throws IOException {
mOutputStream.write(bytes, offset, length);
}
diff --git a/fragment/java/android/support/v4/app/FragmentActivity.java b/fragment/java/android/support/v4/app/FragmentActivity.java
index 2b30b5c..bfb06db 100644
--- a/fragment/java/android/support/v4/app/FragmentActivity.java
+++ b/fragment/java/android/support/v4/app/FragmentActivity.java
@@ -248,6 +248,7 @@
*
* @param isInMultiWindowMode True if the activity is in multi-window mode.
*/
+ @Override
@CallSuper
public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
mFragments.dispatchMultiWindowModeChanged(isInMultiWindowMode);
@@ -262,6 +263,7 @@
*
* @param isInPictureInPictureMode True if the activity is in picture-in-picture mode.
*/
+ @Override
@CallSuper
public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
mFragments.dispatchPictureInPictureModeChanged(isInPictureInPictureMode);
@@ -429,6 +431,7 @@
/**
* Hook in to note that fragment state is no longer saved.
*/
+ @Override
public void onStateNotSaved() {
mFragments.noteStateNotSaved();
}
@@ -631,6 +634,7 @@
* closed for you after you return.
* @param args additional arguments to the dump request.
*/
+ @Override
public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
super.dump(prefix, fd, writer, args);
writer.print(prefix); writer.print("Local FragmentActivity ");
diff --git a/fragment/java/android/support/v4/app/FragmentManager.java b/fragment/java/android/support/v4/app/FragmentManager.java
index 7e448df..0d311c0 100644
--- a/fragment/java/android/support/v4/app/FragmentManager.java
+++ b/fragment/java/android/support/v4/app/FragmentManager.java
@@ -3149,10 +3149,12 @@
mPrimaryNav = f;
}
+ @Override
public Fragment getPrimaryNavigationFragment() {
return mPrimaryNav;
}
+ @Override
public void registerFragmentLifecycleCallbacks(FragmentLifecycleCallbacks cb,
boolean recursive) {
if (mLifecycleCallbacks == null) {
@@ -3161,6 +3163,7 @@
mLifecycleCallbacks.add(new Pair(cb, recursive));
}
+ @Override
public void unregisterFragmentLifecycleCallbacks(FragmentLifecycleCallbacks cb) {
if (mLifecycleCallbacks == null) {
return;
diff --git a/fragment/tests/java/android/support/v4/app/NestedFragmentTest.java b/fragment/tests/java/android/support/v4/app/NestedFragmentTest.java
index 39e19be..4d63c27 100644
--- a/fragment/tests/java/android/support/v4/app/NestedFragmentTest.java
+++ b/fragment/tests/java/android/support/v4/app/NestedFragmentTest.java
@@ -60,6 +60,7 @@
fragmentManager.beginTransaction().add(mParentFragment, "parent").commit();
final CountDownLatch latch = new CountDownLatch(1);
mActivityRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
fragmentManager.executePendingTransactions();
latch.countDown();
@@ -89,6 +90,7 @@
final CountDownLatch latch = new CountDownLatch(1);
mActivityRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mParentFragment.getChildFragment().startActivityForResult(
new Intent(Intent.ACTION_CALL),
diff --git a/media-compat/jellybean-mr2/android/support/v4/media/TransportMediatorJellybeanMR2.java b/media-compat/jellybean-mr2/android/support/v4/media/TransportMediatorJellybeanMR2.java
index c27a716..a3b4eed 100644
--- a/media-compat/jellybean-mr2/android/support/v4/media/TransportMediatorJellybeanMR2.java
+++ b/media-compat/jellybean-mr2/android/support/v4/media/TransportMediatorJellybeanMR2.java
@@ -84,11 +84,12 @@
};
final RemoteControlClient.OnPlaybackPositionUpdateListener mPlaybackPositionUpdateListener
= new RemoteControlClient.OnPlaybackPositionUpdateListener() {
+ @Override
public void onPlaybackPositionUpdate(long newPositionMs) {
mTransportCallback.playbackPositionUpdate(newPositionMs);
}
};
-
+
PendingIntent mPendingIntent;
RemoteControlClient mRemoteControl;
boolean mFocused;
diff --git a/samples/Support13Demos/src/com/example/android/supportv13/Support13Demos.java b/samples/Support13Demos/src/com/example/android/supportv13/Support13Demos.java
index fda4b34..7db027d 100644
--- a/samples/Support13Demos/src/com/example/android/supportv13/Support13Demos.java
+++ b/samples/Support13Demos/src/com/example/android/supportv13/Support13Demos.java
@@ -113,6 +113,7 @@
new Comparator<Map<String, Object>>() {
private final Collator collator = Collator.getInstance();
+ @Override
public int compare(Map<String, Object> map1, Map<String, Object> map2) {
return collator.compare(map1.get("title"), map2.get("title"));
}
diff --git a/samples/Support13Demos/src/com/example/android/supportv13/app/CursorFragment.java b/samples/Support13Demos/src/com/example/android/supportv13/app/CursorFragment.java
index 57f0e10..ee311fc 100644
--- a/samples/Support13Demos/src/com/example/android/supportv13/app/CursorFragment.java
+++ b/samples/Support13Demos/src/com/example/android/supportv13/app/CursorFragment.java
@@ -81,6 +81,7 @@
item.setActionView(sv);
}
+ @Override
public boolean onQueryTextChange(String newText) {
// Called when the action bar search text has changed. Update
// the search filter, and restart the loader to do a new query
@@ -110,6 +111,7 @@
Contacts.LOOKUP_KEY,
};
+ @Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
// This is called when a new Loader needs to be created. This
// sample only has one Loader, so we don't care about the ID.
@@ -133,6 +135,7 @@
Contacts.DISPLAY_NAME + " COLLATE LOCALIZED ASC");
}
+ @Override
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
// Swap the new cursor in. (The framework will take care of closing the
// old cursor once we return.)
@@ -146,6 +149,7 @@
}
}
+ @Override
public void onLoaderReset(Loader<Cursor> loader) {
// This is called when the last Cursor provided to onLoadFinished()
// above is about to be closed. We need to make sure we are no
diff --git a/samples/Support13Demos/src/com/example/android/supportv13/app/FragmentPagerSupport.java b/samples/Support13Demos/src/com/example/android/supportv13/app/FragmentPagerSupport.java
index 04532b8..3d169c8 100644
--- a/samples/Support13Demos/src/com/example/android/supportv13/app/FragmentPagerSupport.java
+++ b/samples/Support13Demos/src/com/example/android/supportv13/app/FragmentPagerSupport.java
@@ -58,12 +58,14 @@
// Watch for button clicks.
Button button = (Button)findViewById(R.id.goto_first);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
mPager.setCurrentItem(0);
}
});
button = (Button)findViewById(R.id.goto_last);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
mPager.setCurrentItem(NUM_ITEMS-1);
}
diff --git a/samples/Support13Demos/src/com/example/android/supportv13/app/FragmentStatePagerSupport.java b/samples/Support13Demos/src/com/example/android/supportv13/app/FragmentStatePagerSupport.java
index e60c268..cec71dd 100644
--- a/samples/Support13Demos/src/com/example/android/supportv13/app/FragmentStatePagerSupport.java
+++ b/samples/Support13Demos/src/com/example/android/supportv13/app/FragmentStatePagerSupport.java
@@ -58,12 +58,14 @@
// Watch for button clicks.
Button button = (Button)findViewById(R.id.goto_first);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
mPager.setCurrentItem(0);
}
});
button = (Button)findViewById(R.id.goto_last);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
mPager.setCurrentItem(NUM_ITEMS-1);
}
diff --git a/samples/Support13Demos/src/com/example/android/supportv13/view/CheckableFrameLayout.java b/samples/Support13Demos/src/com/example/android/supportv13/view/CheckableFrameLayout.java
index f642e8e..e2383de 100644
--- a/samples/Support13Demos/src/com/example/android/supportv13/view/CheckableFrameLayout.java
+++ b/samples/Support13Demos/src/com/example/android/supportv13/view/CheckableFrameLayout.java
@@ -33,15 +33,18 @@
super(context, attrs);
}
+ @Override
public void setChecked(boolean checked) {
mChecked = checked;
setBackgroundDrawable(checked ? new ColorDrawable(0xff0000a0) : null);
}
+ @Override
public boolean isChecked() {
return mChecked;
}
+ @Override
public void toggle() {
setChecked(!mChecked);
}
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/Support4Demos.java b/samples/Support4Demos/src/com/example/android/supportv4/Support4Demos.java
index af445db0..a90551f 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/Support4Demos.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/Support4Demos.java
@@ -38,10 +38,10 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+
Intent intent = getIntent();
String path = intent.getStringExtra("com.example.android.apis.Path");
-
+
if (path == null) {
path = "";
}
@@ -66,16 +66,16 @@
String[] prefixPath;
String prefixWithSlash = prefix;
-
+
if (prefix.equals("")) {
prefixPath = null;
} else {
prefixPath = prefix.split("/");
prefixWithSlash = prefix + "/";
}
-
+
int len = list.size();
-
+
Map<String, Boolean> entries = new HashMap<String, Boolean>();
for (int i = 0; i < len; i++) {
@@ -84,9 +84,9 @@
String label = labelSeq != null
? labelSeq.toString()
: info.activityInfo.name;
-
+
if (prefixWithSlash.length() == 0 || label.startsWith(prefixWithSlash)) {
-
+
String[] labelPath = label.split("/");
String nextLabel = prefixPath == null ? labelPath[0] : labelPath[prefixPath.length];
@@ -105,7 +105,7 @@
}
Collections.sort(myData, sDisplayNameComparator);
-
+
return myData;
}
@@ -113,6 +113,7 @@
new Comparator<Map<String, Object>>() {
private final Collator collator = Collator.getInstance();
+ @Override
public int compare(Map<String, Object> map1, Map<String, Object> map2) {
return collator.compare(map1.get("title"), map2.get("title"));
}
@@ -123,7 +124,7 @@
result.setClassName(pkg, componentName);
return result;
}
-
+
protected Intent browseIntent(String path) {
Intent result = new Intent();
result.setClass(this, Support4Demos.class);
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentAlertDialogSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentAlertDialogSupport.java
index f35e021..c651fdc 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentAlertDialogSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentAlertDialogSupport.java
@@ -47,6 +47,7 @@
// Watch for button clicks.
Button button = (Button)findViewById(R.id.show);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
showDialog();
}
@@ -91,6 +92,7 @@
.setTitle(title)
.setPositiveButton(R.string.alert_dialog_ok,
new DialogInterface.OnClickListener() {
+ @Override
public void onClick(DialogInterface dialog, int whichButton) {
((FragmentAlertDialogSupport)getActivity()).doPositiveClick();
}
@@ -98,6 +100,7 @@
)
.setNegativeButton(R.string.alert_dialog_cancel,
new DialogInterface.OnClickListener() {
+ @Override
public void onClick(DialogInterface dialog, int whichButton) {
((FragmentAlertDialogSupport)getActivity()).doNegativeClick();
}
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java
index 478cb7d..917b614 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java
@@ -42,6 +42,7 @@
// Watch for button clicks.
Button button = (Button) findViewById(R.id.new_fragment);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
addFragmentToStack();
}
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java
index 06b2730..dd5cca7 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java
@@ -48,6 +48,7 @@
// Watch for button clicks.
Button button = (Button)findViewById(R.id.show_dialog);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
showDialog();
}
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentDialogSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentDialogSupport.java
index b387bfc..140e920 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentDialogSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentDialogSupport.java
@@ -48,6 +48,7 @@
// Watch for button clicks.
Button button = (Button)findViewById(R.id.show);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
showDialog();
}
@@ -155,6 +156,7 @@
// Watch for button clicks.
Button button = (Button)v.findViewById(R.id.show);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
// When button is clicked, call up to owning activity.
((FragmentDialogSupport)getActivity()).showDialog();
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentHideShowSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentHideShowSupport.java
index 3441506..0e8fe46 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentHideShowSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentHideShowSupport.java
@@ -57,6 +57,7 @@
void addShowHideListener(int buttonId, final Fragment fragment) {
final Button button = (Button)findViewById(buttonId);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
ft.setCustomAnimations(android.R.anim.fade_in,
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java
index fb65a2b..b8d60d6 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java
@@ -40,6 +40,7 @@
// Update fragment visibility when check boxes are changed.
final OnClickListener mClickListener = new OnClickListener() {
+ @Override
public void onClick(View v) {
updateFragmentVisibility();
}
@@ -64,13 +65,13 @@
ft.add(mFragment2, "f2");
}
ft.commit();
-
+
// Watch check box clicks.
mCheckBox1 = (CheckBox)v.findViewById(R.id.menu1);
mCheckBox1.setOnClickListener(mClickListener);
mCheckBox2 = (CheckBox)v.findViewById(R.id.menu2);
mCheckBox2.setOnClickListener(mClickListener);
-
+
// Make sure fragments start out with correct visibility.
updateFragmentVisibility();
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentMenuSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentMenuSupport.java
index eda8893..29a8e52 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentMenuSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentMenuSupport.java
@@ -41,6 +41,7 @@
// Update fragment visibility when check boxes are changed.
final OnClickListener mClickListener = new OnClickListener() {
+ @Override
public void onClick(View v) {
updateFragmentVisibility();
}
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentPagerSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentPagerSupport.java
index f413744..14688f3 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentPagerSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentPagerSupport.java
@@ -57,12 +57,14 @@
// Watch for button clicks.
Button button = (Button)findViewById(R.id.goto_first);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
mPager.setCurrentItem(0);
}
});
button = (Button)findViewById(R.id.goto_last);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
mPager.setCurrentItem(NUM_ITEMS-1);
}
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentReceiveResultSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentReceiveResultSupport.java
index 4a8e3a3..5f82befc 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentReceiveResultSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentReceiveResultSupport.java
@@ -62,6 +62,7 @@
private TextView mResults;
private OnClickListener mGetListener = new OnClickListener() {
+ @Override
public void onClick(View v) {
// Start the activity whose result we want to retrieve. The
// result will come back with request code GET_CODE.
@@ -71,6 +72,7 @@
};
private OnClickListener mIntentSenderListener = new OnClickListener() {
+ @Override
public void onClick(View v) {
// Start the intent sender whose result we want to retrieve. The
// result will come back with request code GET_INTENT_SENDER_CODE.
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentRetainInstanceSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentRetainInstanceSupport.java
index 0ff34dd..8472aa4 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentRetainInstanceSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentRetainInstanceSupport.java
@@ -63,6 +63,7 @@
// Watch for button clicks.
Button button = (Button)v.findViewById(R.id.restart);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
mWorkFragment.restart();
}
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStackFragmentSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStackFragmentSupport.java
index d2eb29a..2c289d7 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStackFragmentSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStackFragmentSupport.java
@@ -53,18 +53,21 @@
// Watch for button clicks.
Button button = (Button)v.findViewById(R.id.new_fragment);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
addFragmentToStack();
}
});
button = (Button)v.findViewById(R.id.delete_fragment);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
getChildFragmentManager().popBackStack();
}
});
button = (Button)v.findViewById(R.id.home);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
// If there is a back stack, pop it all.
FragmentManager fm = getChildFragmentManager();
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStackSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStackSupport.java
index 4115d5e..751b0e1 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStackSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStackSupport.java
@@ -43,12 +43,14 @@
// Watch for button clicks.
Button button = (Button) findViewById(R.id.new_fragment);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
addFragmentToStack();
}
});
button = (Button) findViewById(R.id.home);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
// If there is a back stack, pop it all.
FragmentManager fm = getSupportFragmentManager();
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStatePagerSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStatePagerSupport.java
index 2939b0e..83d9db4 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStatePagerSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStatePagerSupport.java
@@ -58,12 +58,14 @@
// Watch for button clicks.
Button button = (Button)findViewById(R.id.goto_first);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
mPager.setCurrentItem(0);
}
});
button = (Button)findViewById(R.id.goto_last);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
mPager.setCurrentItem(NUM_ITEMS-1);
}
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/LoaderThrottleSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/LoaderThrottleSupport.java
index 80e237c..a03a690e 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/LoaderThrottleSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/LoaderThrottleSupport.java
@@ -486,6 +486,7 @@
MainTable.COLUMN_NAME_DATA,
};
+ @Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
CursorLoader cl = new CursorLoader(getActivity(), MainTable.CONTENT_URI,
PROJECTION, null, null, null);
@@ -493,6 +494,7 @@
return cl;
}
+ @Override
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
mAdapter.swapCursor(data);
@@ -504,6 +506,7 @@
}
}
+ @Override
public void onLoaderReset(Loader<Cursor> loader) {
mAdapter.swapCursor(null);
}
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/SendResult.java b/samples/Support4Demos/src/com/example/android/supportv4/app/SendResult.java
index 7179505..6495f1f 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/SendResult.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/SendResult.java
@@ -58,6 +58,7 @@
private OnClickListener mCorkyListener = new OnClickListener()
{
+ @Override
public void onClick(View v)
{
// To send a result, simply call setResult() before your
@@ -69,6 +70,7 @@
private OnClickListener mVioletListener = new OnClickListener()
{
+ @Override
public void onClick(View v)
{
// To send a result, simply call setResult() before your
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/content/LocalServiceBroadcaster.java b/samples/Support4Demos/src/com/example/android/supportv4/content/LocalServiceBroadcaster.java
index 62a320c..feb5734 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/content/LocalServiceBroadcaster.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/content/LocalServiceBroadcaster.java
@@ -95,12 +95,14 @@
}
private OnClickListener mStartListener = new OnClickListener() {
+ @Override
public void onClick(View v) {
startService(new Intent(LocalServiceBroadcaster.this, LocalService.class));
}
};
private OnClickListener mStopListener = new OnClickListener() {
+ @Override
public void onClick(View v) {
stopService(new Intent(LocalServiceBroadcaster.this, LocalService.class));
}
@@ -136,6 +138,7 @@
mLocalBroadcastManager = LocalBroadcastManager.getInstance(this);
}
+ @Override
public int onStartCommand(Intent intent, int flags, int startId) {
// Tell any local interested parties about the start.
mLocalBroadcastManager.sendBroadcast(new Intent(ACTION_STARTED));
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/content/SimpleWakefulController.java b/samples/Support4Demos/src/com/example/android/supportv4/content/SimpleWakefulController.java
index bf3b2c0..78f46f2 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/content/SimpleWakefulController.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/content/SimpleWakefulController.java
@@ -44,6 +44,7 @@
}
private View.OnClickListener mScheduleListener = new View.OnClickListener() {
+ @Override
public void onClick(View v) {
// When the alarm goes off, we want to broadcast an Intent to our
// BroadcastReceiver. Here we make an Intent with an explicit class
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/media/MediaController.java b/samples/Support4Demos/src/com/example/android/supportv4/media/MediaController.java
index 546fe8c..c3263ad 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/media/MediaController.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/media/MediaController.java
@@ -237,6 +237,7 @@
}
private View.OnClickListener mPauseListener = new View.OnClickListener() {
+ @Override
public void onClick(View v) {
doPauseResume();
}
@@ -274,10 +275,12 @@
// case there WON'T BE onStartTrackingTouch/onStopTrackingTouch notifications,
// we will simply apply the updated position without suspending regular updates.
private SeekBar.OnSeekBarChangeListener mSeekListener = new SeekBar.OnSeekBarChangeListener() {
+ @Override
public void onStartTrackingTouch(SeekBar bar) {
mDragging = true;
}
+ @Override
public void onProgressChanged(SeekBar bar, int progress, boolean fromuser) {
if (!fromuser) {
// We're not interested in programmatically generated changes to
@@ -292,6 +295,7 @@
mCurrentTime.setText(stringForTime( (int) newposition));
}
+ @Override
public void onStopTrackingTouch(SeekBar bar) {
mDragging = false;
updateProgress();
@@ -318,6 +322,7 @@
}
private View.OnClickListener mRewListener = new View.OnClickListener() {
+ @Override
public void onClick(View v) {
long pos = mController.getCurrentPosition();
pos -= 5000; // milliseconds
@@ -327,6 +332,7 @@
};
private View.OnClickListener mFfwdListener = new View.OnClickListener() {
+ @Override
public void onClick(View v) {
long pos = mController.getCurrentPosition();
pos += 15000; // milliseconds
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/media/QueueAdapter.java b/samples/Support4Demos/src/com/example/android/supportv4/media/QueueAdapter.java
index 3d327ff..80c53f6 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/media/QueueAdapter.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/media/QueueAdapter.java
@@ -52,6 +52,7 @@
TextView mDescriptionView;
}
+ @Override
public View getView(int position, View convertView, ViewGroup parent) {
ViewHolder holder;
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/view/CheckableFrameLayout.java b/samples/Support4Demos/src/com/example/android/supportv4/view/CheckableFrameLayout.java
index 1ca8840..6fc6b39 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/view/CheckableFrameLayout.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/view/CheckableFrameLayout.java
@@ -34,15 +34,18 @@
super(context, attrs);
}
+ @Override
public void setChecked(boolean checked) {
mChecked = checked;
ViewCompat.setBackground(this, checked ? new ColorDrawable(0xff0000a0) : null);
}
+ @Override
public boolean isChecked() {
return mChecked;
}
+ @Override
public void toggle() {
setChecked(!mChecked);
}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/AppCompatPreferenceActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/app/AppCompatPreferenceActivity.java
index e2ae88c..17f34243 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/app/AppCompatPreferenceActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/app/AppCompatPreferenceActivity.java
@@ -115,6 +115,7 @@
getDelegate().onDestroy();
}
+ @Override
public void invalidateOptionsMenu() {
getDelegate().invalidateOptionsMenu();
}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/widget/GridLayoutManagerActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/widget/GridLayoutManagerActivity.java
index 1191be0..f086bdf 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/widget/GridLayoutManagerActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/GridLayoutManagerActivity.java
@@ -110,6 +110,7 @@
}
}
+ @Override
protected RecyclerView.Adapter createAdapter() {
mAdapter = new SimpleStringAdapter(this, Cheeses.sCheeseStrings) {
@Override
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java
index 88b9992..dff2940 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java
@@ -146,6 +146,7 @@
}
}
+ @Override
protected RecyclerView.Adapter createAdapter() {
return new OuterAdapter(Cheeses.sCheeseStrings);
}
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/widget/StableIdActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/widget/StableIdActivity.java
index 8932704..70216f5 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/widget/StableIdActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/StableIdActivity.java
@@ -63,6 +63,7 @@
return new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
}
+ @Override
protected RecyclerView.Adapter createAdapter() {
return new StableIdAdapter(Cheeses.sCheeseStrings);
}
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
index 6c1ce85..2f0e861a 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
@@ -106,6 +106,7 @@
// simulates in a real world use case data being loaded two seconds later
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
setupRows();
loadData();
@@ -289,6 +290,7 @@
setAdapter(adapter);
// simulates late data loading:
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
loadFragmentData();
}
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java
index fa1425b..c78319d 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java
@@ -109,6 +109,7 @@
// simulates in a real world use case data being loaded two seconds later
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
setupRows();
loadData();
@@ -292,6 +293,7 @@
setAdapter(adapter);
// simulates late data loading:
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
loadFragmentData();
}
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/DetailsFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/DetailsFragment.java
index 56acc05..bb282f4 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/DetailsFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/DetailsFragment.java
@@ -183,6 +183,7 @@
}
mRowsAdapter.clear();
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
final Context context = getActivity();
DetailsOverviewRow dor = new DetailsOverviewRow(mPhotoItem.getTitle());
@@ -198,6 +199,7 @@
}, TIME_TO_LOAD_OVERVIEW_ROW_MS);
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
for (int i = 0; i < NUM_ROWS; ++i) {
ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(cardPresenter);
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/DetailsSupportFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/DetailsSupportFragment.java
index e58e2e7..8e7a127 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/DetailsSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/DetailsSupportFragment.java
@@ -186,6 +186,7 @@
}
mRowsAdapter.clear();
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
final Context context = getActivity();
DetailsOverviewRow dor = new DetailsOverviewRow(mPhotoItem.getTitle());
@@ -201,6 +202,7 @@
}, TIME_TO_LOAD_OVERVIEW_ROW_MS);
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
for (int i = 0; i < NUM_ROWS; ++i) {
ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(cardPresenter);
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java
index a311338..e7831d6 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java
@@ -376,8 +376,10 @@
mExpandPaymentListInOnCreateView = true;
}
+ @Override
public GuidedActionsStylist onCreateActionsStylist() {
return new GuidedActionsStylist() {
+ @Override
protected void setupImeOptions(GuidedActionsStylist.ViewHolder vh,
GuidedAction action) {
if (action.getId() == PASSWORD) {
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java
index 0cd6edd..717fccd 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java
@@ -379,8 +379,10 @@
mExpandPaymentListInOnCreateView = true;
}
+ @Override
public GuidedActionsStylist onCreateActionsStylist() {
return new GuidedActionsStylist() {
+ @Override
protected void setupImeOptions(GuidedActionsStylist.ViewHolder vh,
GuidedAction action) {
if (action.getId() == PASSWORD) {
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/NewDetailsFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/NewDetailsFragment.java
index 9b801dc..3807de1 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/NewDetailsFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/NewDetailsFragment.java
@@ -228,6 +228,7 @@
}
mRowsAdapter.clear();
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
if (TEST_OVERVIEW_ROW_ON_SECOND) {
ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(cardPresenter);
@@ -259,6 +260,7 @@
}, TIME_TO_LOAD_OVERVIEW_ROW_MS);
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
for (int i = 0; i < NUM_ROWS; ++i) {
ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(cardPresenter);
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/NewDetailsSupportFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/NewDetailsSupportFragment.java
index 77ce368..697b1e0 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/NewDetailsSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/NewDetailsSupportFragment.java
@@ -231,6 +231,7 @@
}
mRowsAdapter.clear();
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
if (TEST_OVERVIEW_ROW_ON_SECOND) {
ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(cardPresenter);
@@ -262,6 +263,7 @@
}, TIME_TO_LOAD_OVERVIEW_ROW_MS);
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
for (int i = 0; i < NUM_ROWS; ++i) {
ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(cardPresenter);
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackFragment.java
index 91ecd62..2687d70 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackFragment.java
@@ -59,6 +59,7 @@
private PlaybackControlGlue mGlue;
private ListRowPresenter mListRowPresenter;
+ @Override
public SparseArrayObjectAdapter getAdapter() {
return (SparseArrayObjectAdapter) super.getAdapter();
}
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java
index 8e9dde2..21086d9 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlayFragment.java
@@ -84,6 +84,7 @@
}
};
+ @Override
public SparseArrayObjectAdapter getAdapter() {
return (SparseArrayObjectAdapter) super.getAdapter();
}
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java
index f2de9a9..879ee69 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportFragment.java
@@ -87,6 +87,7 @@
}
};
+ @Override
public SparseArrayObjectAdapter getAdapter() {
return (SparseArrayObjectAdapter) super.getAdapter();
}
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackSupportFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackSupportFragment.java
index 64effab..d83f917 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackSupportFragment.java
@@ -62,6 +62,7 @@
private PlaybackControlGlue mGlue;
private ListRowPresenter mListRowPresenter;
+ @Override
public SparseArrayObjectAdapter getAdapter() {
return (SparseArrayObjectAdapter) super.getAdapter();
}
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/StringPresenter.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/StringPresenter.java
index 0302f68..40883bb 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/StringPresenter.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/StringPresenter.java
@@ -23,6 +23,7 @@
public class StringPresenter extends Presenter {
private static final String TAG = "StringPresenter";
+ @Override
public ViewHolder onCreateViewHolder(ViewGroup parent) {
Log.d(TAG, "onCreateViewHolder");
final Context context = parent.getContext();
@@ -34,12 +35,14 @@
return new ViewHolder(tv);
}
+ @Override
public void onBindViewHolder(ViewHolder viewHolder, Object item) {
Log.d(TAG, "onBindViewHolder for " + item.toString());
((TextView) viewHolder.view).setText(item.toString());
}
+ @Override
public void onUnbindViewHolder(ViewHolder viewHolder) {
- Log.d(TAG, "onUnbindViewHolder");
+ Log.d(TAG, "onUnbindViewHolder");
}
}
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/VerticalGridFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/VerticalGridFragment.java
index 68de793..f7b8c8c 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/VerticalGridFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/VerticalGridFragment.java
@@ -65,6 +65,7 @@
}
// simulates in a real world use case data being loaded two seconds later
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
loadData();
startEntranceTransition();
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/VerticalGridSupportFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/VerticalGridSupportFragment.java
index e8f0cc8..6843e55 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/VerticalGridSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/VerticalGridSupportFragment.java
@@ -68,6 +68,7 @@
}
// simulates in a real world use case data being loaded two seconds later
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
loadData();
startEntranceTransition();
diff --git a/transition/tests/src/android/support/transition/TransitionTest.java b/transition/tests/src/android/support/transition/TransitionTest.java
index 03623b5..f9370c9e 100644
--- a/transition/tests/src/android/support/transition/TransitionTest.java
+++ b/transition/tests/src/android/support/transition/TransitionTest.java
@@ -314,12 +314,15 @@
public static class EmptyTransition extends Transition {
+ @Override
public void captureEndValues(@NonNull TransitionValues transitionValues) {
}
+ @Override
public void captureStartValues(@NonNull TransitionValues transitionValues) {
}
+ @Override
public Animator createAnimator(@NonNull ViewGroup sceneRoot,
@Nullable TransitionValues startValues,
@Nullable TransitionValues endValues) {
@@ -330,18 +333,23 @@
public static class EmptyTransitionListener implements Transition.TransitionListener {
+ @Override
public void onTransitionStart(@NonNull Transition transition) {
}
+ @Override
public void onTransitionEnd(@NonNull Transition transition) {
}
+ @Override
public void onTransitionCancel(@NonNull Transition transition) {
}
+ @Override
public void onTransitionPause(@NonNull Transition transition) {
}
+ @Override
public void onTransitionResume(@NonNull Transition transition) {
}
diff --git a/v13/tests/java/android/support/v13/view/DragStartHelperTest.java b/v13/tests/java/android/support/v13/view/DragStartHelperTest.java
index 21cd71e..c92de6a 100644
--- a/v13/tests/java/android/support/v13/view/DragStartHelperTest.java
+++ b/v13/tests/java/android/support/v13/view/DragStartHelperTest.java
@@ -147,10 +147,12 @@
this(anchor.getWidth() / 2 + x, anchor.getHeight() / 2 + y);
}
+ @Override
public boolean matches(Object actual) {
return mExpectedPosition.equals(actual);
}
+ @Override
public void describeTo(Description description) {
description.appendText("TouchPositionMatcher: " + mExpectedPosition);
}
diff --git a/v14/preference/src/android/support/v14/preference/ListPreferenceDialogFragment.java b/v14/preference/src/android/support/v14/preference/ListPreferenceDialogFragment.java
index 6b385d8..6119071 100644
--- a/v14/preference/src/android/support/v14/preference/ListPreferenceDialogFragment.java
+++ b/v14/preference/src/android/support/v14/preference/ListPreferenceDialogFragment.java
@@ -80,6 +80,7 @@
builder.setSingleChoiceItems(mEntries, mClickedDialogEntryIndex,
new DialogInterface.OnClickListener() {
+ @Override
public void onClick(DialogInterface dialog, int which) {
mClickedDialogEntryIndex = which;
diff --git a/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java b/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java
index cb38c44..901bf06 100644
--- a/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java
+++ b/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java
@@ -169,6 +169,7 @@
*
* @return The list as an array.
*/
+ @Override
public CharSequence[] getEntries() {
return mEntries;
}
@@ -197,6 +198,7 @@
*
* @return The array of values.
*/
+ @Override
public CharSequence[] getEntryValues() {
return mEntryValues;
}
@@ -207,6 +209,7 @@
*
* @param values The values to set for the key.
*/
+ @Override
public void setValues(Set<String> values) {
mValues.clear();
mValues.addAll(values);
@@ -217,6 +220,7 @@
/**
* Retrieves the current value of the key.
*/
+ @Override
public Set<String> getValues() {
return mValues;
}
@@ -320,10 +324,12 @@
public static final Parcelable.Creator<SavedState> CREATOR =
new Parcelable.Creator<SavedState>() {
+ @Override
public SavedState createFromParcel(Parcel in) {
return new SavedState(in);
}
+ @Override
public SavedState[] newArray(int size) {
return new SavedState[size];
}
diff --git a/v14/preference/src/android/support/v14/preference/MultiSelectListPreferenceDialogFragment.java b/v14/preference/src/android/support/v14/preference/MultiSelectListPreferenceDialogFragment.java
index 6f116db..8192583 100644
--- a/v14/preference/src/android/support/v14/preference/MultiSelectListPreferenceDialogFragment.java
+++ b/v14/preference/src/android/support/v14/preference/MultiSelectListPreferenceDialogFragment.java
@@ -102,6 +102,7 @@
}
builder.setMultiChoiceItems(mEntries, checkedItems,
new DialogInterface.OnMultiChoiceClickListener() {
+ @Override
public void onClick(DialogInterface dialog, int which, boolean isChecked) {
if (isChecked) {
mPreferenceChanged |= mNewValues.add(
diff --git a/v14/preference/src/android/support/v14/preference/PreferenceFragment.java b/v14/preference/src/android/support/v14/preference/PreferenceFragment.java
index 59d1d4e..433fbda 100644
--- a/v14/preference/src/android/support/v14/preference/PreferenceFragment.java
+++ b/v14/preference/src/android/support/v14/preference/PreferenceFragment.java
@@ -157,6 +157,7 @@
};
final private Runnable mRequestFocus = new Runnable() {
+ @Override
public void run() {
mList.focusableViewAvailable(mList);
}
@@ -474,6 +475,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean onPreferenceTreeClick(Preference preference) {
if (preference.getFragment() != null) {
boolean handled = false;
@@ -520,6 +522,7 @@
* @return The {@link Preference} with the key, or null.
* @see android.support.v7.preference.PreferenceGroup#findPreference(CharSequence)
*/
+ @Override
public Preference findPreference(CharSequence key) {
if (mPreferenceManager == null) {
return null;
diff --git a/v17/leanback/src/android/support/v17/leanback/app/BackgroundManager.java b/v17/leanback/src/android/support/v17/leanback/app/BackgroundManager.java
index 1989791..3dbc78a 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/BackgroundManager.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/BackgroundManager.java
@@ -200,6 +200,7 @@
invalidateSelf();
}
+ @Override
public ColorFilter getColorFilter() {
return mState.mPaint.getColorFilter();
}
@@ -269,6 +270,7 @@
}
// Queried by system transitions
+ @Override
public int getAlpha() {
return mAlpha;
}
diff --git a/v17/leanback/src/android/support/v17/leanback/app/PlaybackControlGlue.java b/v17/leanback/src/android/support/v17/leanback/app/PlaybackControlGlue.java
index eb2ce28..d74fd11 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/PlaybackControlGlue.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/PlaybackControlGlue.java
@@ -250,6 +250,7 @@
return getControlsRowPresenter();
}
+ @Override
protected SparseArrayObjectAdapter createPrimaryActionsAdapter(
PresenterSelector presenterSelector) {
return super.createPrimaryActionsAdapter(presenterSelector);
diff --git a/v17/leanback/src/android/support/v17/leanback/app/SearchFragment.java b/v17/leanback/src/android/support/v17/leanback/app/SearchFragment.java
index d65937c..acf4745 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/SearchFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/SearchFragment.java
@@ -237,6 +237,7 @@
}
};
+ @Override
public void onRequestPermissionsResult(int requestCode, String[] permissions,
int[] grantResults) {
if (requestCode == AUDIO_PERMISSION_REQUEST_CODE && permissions.length > 0) {
diff --git a/v17/leanback/src/android/support/v17/leanback/app/SearchSupportFragment.java b/v17/leanback/src/android/support/v17/leanback/app/SearchSupportFragment.java
index ae4c700..36b560d 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/SearchSupportFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/SearchSupportFragment.java
@@ -240,6 +240,7 @@
}
};
+ @Override
public void onRequestPermissionsResult(int requestCode, String[] permissions,
int[] grantResults) {
if (requestCode == AUDIO_PERMISSION_REQUEST_CODE && permissions.length > 0) {
diff --git a/v17/leanback/src/android/support/v17/leanback/graphics/CompositeDrawable.java b/v17/leanback/src/android/support/v17/leanback/graphics/CompositeDrawable.java
index 5e7e654..edbca3c 100644
--- a/v17/leanback/src/android/support/v17/leanback/graphics/CompositeDrawable.java
+++ b/v17/leanback/src/android/support/v17/leanback/graphics/CompositeDrawable.java
@@ -189,6 +189,7 @@
/**
* @return Alpha value between 0(inclusive) and 255(inclusive)
*/
+ @Override
public int getAlpha() {
final Drawable dr = getFirstNonNullDrawable();
if (dr != null) {
diff --git a/v17/leanback/src/android/support/v17/leanback/graphics/FitWidthBitmapDrawable.java b/v17/leanback/src/android/support/v17/leanback/graphics/FitWidthBitmapDrawable.java
index 910f313..d1e28de 100644
--- a/v17/leanback/src/android/support/v17/leanback/graphics/FitWidthBitmapDrawable.java
+++ b/v17/leanback/src/android/support/v17/leanback/graphics/FitWidthBitmapDrawable.java
@@ -176,6 +176,7 @@
/**
* @return Alpha value between 0(inclusive) and 255(inclusive)
*/
+ @Override
public int getAlpha() {
return mBitmapState.mPaint.getAlpha();
}
@@ -214,10 +215,12 @@
// use Property
PROPERTY_VERTICAL_OFFSET = new Property<FitWidthBitmapDrawable, Integer>(Integer.class,
"verticalOffset") {
+ @Override
public void set(FitWidthBitmapDrawable object, Integer value) {
object.setVerticalOffset(value);
}
+ @Override
public Integer get(FitWidthBitmapDrawable object) {
return object.getVerticalOffset();
}
@@ -228,6 +231,7 @@
@TargetApi(24)
static IntProperty<FitWidthBitmapDrawable> getVerticalOffsetIntProperty() {
return new IntProperty<FitWidthBitmapDrawable>("verticalOffset") {
+ @Override
public void setValue(FitWidthBitmapDrawable fitWidthBitmapDrawable, int value) {
fitWidthBitmapDrawable.setVerticalOffset(value);
}
diff --git a/v17/leanback/src/android/support/v17/leanback/media/MediaPlayerGlue.java b/v17/leanback/src/android/support/v17/leanback/media/MediaPlayerGlue.java
index b0f0b8a..dd0127c 100644
--- a/v17/leanback/src/android/support/v17/leanback/media/MediaPlayerGlue.java
+++ b/v17/leanback/src/android/support/v17/leanback/media/MediaPlayerGlue.java
@@ -140,6 +140,7 @@
/**
* Sets the callback, which would tell the listener that video is ready to be played.
*/
+ @Override
public void setPlayerCallback(PlayerCallback callback) {
this.mPlayerCallback = callback;
}
diff --git a/v17/leanback/src/android/support/v17/leanback/widget/RowContainerView.java b/v17/leanback/src/android/support/v17/leanback/widget/RowContainerView.java
index a8ea24c..a329c08 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/RowContainerView.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/RowContainerView.java
@@ -72,6 +72,7 @@
mHeaderDock.setVisibility(show ? View.VISIBLE : View.GONE);
}
+ @Override
public void setForeground(Drawable d) {
mForeground = d;
setWillNotDraw(mForeground == null);
@@ -87,6 +88,7 @@
}
}
+ @Override
public Drawable getForeground() {
return mForeground;
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/BrowseFragmentTest.java b/v17/leanback/tests/java/android/support/v17/leanback/app/BrowseFragmentTest.java
index 0008f93..65e4b89 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/BrowseFragmentTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/BrowseFragmentTest.java
@@ -56,6 +56,7 @@
@After
public void afterTest() throws Throwable {
activityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
if (mActivity != null) {
mActivity.finish();
@@ -185,6 +186,7 @@
this.expectedRow = expectedRow;
}
+ @Override
public void run(Presenter.ViewHolder holder) {
android.util.Log.d(TAG, dumpRecyclerView(activity.getBrowseTestFragment()
.getGridView()));
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/BrowseSupportFragmentTest.java b/v17/leanback/tests/java/android/support/v17/leanback/app/BrowseSupportFragmentTest.java
index c7862c9..9778e4f 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/BrowseSupportFragmentTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/BrowseSupportFragmentTest.java
@@ -59,6 +59,7 @@
@After
public void afterTest() throws Throwable {
activityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
if (mActivity != null) {
mActivity.finish();
@@ -188,6 +189,7 @@
this.expectedRow = expectedRow;
}
+ @Override
public void run(Presenter.ViewHolder holder) {
android.util.Log.d(TAG, dumpRecyclerView(activity.getBrowseTestSupportFragment()
.getGridView()));
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/DetailsTestFragment.java b/v17/leanback/tests/java/android/support/v17/leanback/app/DetailsTestFragment.java
index ef6a1a3..354e574 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/DetailsTestFragment.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/DetailsTestFragment.java
@@ -103,6 +103,7 @@
mPhotoItem = photoItem;
mRowsAdapter.clear();
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
if (getActivity() == null) {
return;
@@ -121,6 +122,7 @@
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
if (getActivity() == null) {
return;
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/DetailsTestSupportFragment.java b/v17/leanback/tests/java/android/support/v17/leanback/app/DetailsTestSupportFragment.java
index d963c3e..7d03a45 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/DetailsTestSupportFragment.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/DetailsTestSupportFragment.java
@@ -106,6 +106,7 @@
mPhotoItem = photoItem;
mRowsAdapter.clear();
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
if (getActivity() == null) {
return;
@@ -124,6 +125,7 @@
new Handler().postDelayed(new Runnable() {
+ @Override
public void run() {
if (getActivity() == null) {
return;
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/GuidedStepFragmentTest.java b/v17/leanback/tests/java/android/support/v17/leanback/app/GuidedStepFragmentTest.java
index 80ca4eb..bb8e94b 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/GuidedStepFragmentTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/GuidedStepFragmentTest.java
@@ -56,6 +56,7 @@
final String secondFragmentName = generateMethodTestName("second");
GuidedStepTestFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
actions.add(new GuidedAction.Builder().id(1000).title("OK").build());
@@ -63,6 +64,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
GuidedAction action = (GuidedAction) invocation.getArguments()[0];
GuidedStepTestFragment.Provider obj = (GuidedStepTestFragment.Provider)
@@ -131,6 +133,7 @@
final String secondFragmentName = generateMethodTestName("second");
GuidedStepTestFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
actions.add(new GuidedAction.Builder().id(1000).title("OK").build());
@@ -142,6 +145,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
GuidedAction action = (GuidedAction) invocation.getArguments()[0];
GuidedStepTestFragment.Provider obj = (GuidedStepTestFragment.Provider)
@@ -197,6 +201,7 @@
final String firstFragmentName = generateMethodTestName("first");
GuidedStepTestFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
actions.add(new GuidedAction.Builder().id(1001).title("Finish activity").build());
@@ -204,6 +209,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
GuidedAction action = (GuidedAction) invocation.getArguments()[0];
GuidedStepTestFragment.Provider obj = (GuidedStepTestFragment.Provider)
@@ -229,6 +235,7 @@
final String firstFragmentName = generateMethodTestName("first");
GuidedStepTestFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
actions.add(new GuidedAction.Builder().id(1001).title("Finish fragments").build());
@@ -236,6 +243,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
GuidedAction action = (GuidedAction) invocation.getArguments()[0];
GuidedStepTestFragment.Provider obj = (GuidedStepTestFragment.Provider)
@@ -266,6 +274,7 @@
final boolean[] expandSubActionInOnCreateView = new boolean[] {false};
GuidedStepTestFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
GuidedStepTestFragment.Provider obj = (GuidedStepTestFragment.Provider)
invocation.getMock();
@@ -277,6 +286,7 @@
}).when(first).onCreateView(any(LayoutInflater.class), any(ViewGroup.class),
any(Bundle.class), any(View.class));
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
List<GuidedAction> subActions = new ArrayList<GuidedAction>();
@@ -288,6 +298,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Boolean>() {
+ @Override
public Boolean answer(InvocationOnMock invocation) {
GuidedStepTestFragment.Provider obj = (GuidedStepTestFragment.Provider)
invocation.getMock();
@@ -358,6 +369,7 @@
final String firstFragmentName = generateMethodTestName("first");
GuidedStepTestFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
List<GuidedAction> subActions = new ArrayList<GuidedAction>();
@@ -368,6 +380,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Boolean>() {
+ @Override
public Boolean answer(InvocationOnMock invocation) {
GuidedStepTestFragment.Provider obj = (GuidedStepTestFragment.Provider)
invocation.getMock();
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/GuidedStepSupportFragmentTest.java b/v17/leanback/tests/java/android/support/v17/leanback/app/GuidedStepSupportFragmentTest.java
index 880236e..f2ac612 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/GuidedStepSupportFragmentTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/GuidedStepSupportFragmentTest.java
@@ -59,6 +59,7 @@
final String secondFragmentName = generateMethodTestName("second");
GuidedStepTestSupportFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
actions.add(new GuidedAction.Builder().id(1000).title("OK").build());
@@ -66,6 +67,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
GuidedAction action = (GuidedAction) invocation.getArguments()[0];
GuidedStepTestSupportFragment.Provider obj = (GuidedStepTestSupportFragment.Provider)
@@ -134,6 +136,7 @@
final String secondFragmentName = generateMethodTestName("second");
GuidedStepTestSupportFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
actions.add(new GuidedAction.Builder().id(1000).title("OK").build());
@@ -145,6 +148,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
GuidedAction action = (GuidedAction) invocation.getArguments()[0];
GuidedStepTestSupportFragment.Provider obj = (GuidedStepTestSupportFragment.Provider)
@@ -200,6 +204,7 @@
final String firstFragmentName = generateMethodTestName("first");
GuidedStepTestSupportFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
actions.add(new GuidedAction.Builder().id(1001).title("Finish activity").build());
@@ -207,6 +212,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
GuidedAction action = (GuidedAction) invocation.getArguments()[0];
GuidedStepTestSupportFragment.Provider obj = (GuidedStepTestSupportFragment.Provider)
@@ -232,6 +238,7 @@
final String firstFragmentName = generateMethodTestName("first");
GuidedStepTestSupportFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
actions.add(new GuidedAction.Builder().id(1001).title("Finish fragments").build());
@@ -239,6 +246,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
GuidedAction action = (GuidedAction) invocation.getArguments()[0];
GuidedStepTestSupportFragment.Provider obj = (GuidedStepTestSupportFragment.Provider)
@@ -269,6 +277,7 @@
final boolean[] expandSubActionInOnCreateView = new boolean[] {false};
GuidedStepTestSupportFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
GuidedStepTestSupportFragment.Provider obj = (GuidedStepTestSupportFragment.Provider)
invocation.getMock();
@@ -280,6 +289,7 @@
}).when(first).onCreateView(any(LayoutInflater.class), any(ViewGroup.class),
any(Bundle.class), any(View.class));
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
List<GuidedAction> subActions = new ArrayList<GuidedAction>();
@@ -291,6 +301,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Boolean>() {
+ @Override
public Boolean answer(InvocationOnMock invocation) {
GuidedStepTestSupportFragment.Provider obj = (GuidedStepTestSupportFragment.Provider)
invocation.getMock();
@@ -361,6 +372,7 @@
final String firstFragmentName = generateMethodTestName("first");
GuidedStepTestSupportFragment.Provider first = mockProvider(firstFragmentName);
doAnswer(new Answer<Void>() {
+ @Override
public Void answer(InvocationOnMock invocation) {
List actions = (List) invocation.getArguments()[0];
List<GuidedAction> subActions = new ArrayList<GuidedAction>();
@@ -371,6 +383,7 @@
}
}).when(first).onCreateActions(any(List.class), any(Bundle.class));
doAnswer(new Answer<Boolean>() {
+ @Override
public Boolean answer(InvocationOnMock invocation) {
GuidedStepTestSupportFragment.Provider obj = (GuidedStepTestSupportFragment.Provider)
invocation.getMock();
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackFragmentTest.java b/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackFragmentTest.java
index 7282eac..b1c6d14 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackFragmentTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackFragmentTest.java
@@ -55,6 +55,7 @@
final PlaybackTestFragment fragment = (PlaybackTestFragment) mActivity.getTestFragment();
PlaybackGlue glue = fragment.getGlue();
activityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mActivity.finish();
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackOverlayTestFragment.java b/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackOverlayTestFragment.java
index e5dbe08..388cfc8 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackOverlayTestFragment.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackOverlayTestFragment.java
@@ -84,6 +84,7 @@
}
};
+ @Override
public SparseArrayObjectAdapter getAdapter() {
return (SparseArrayObjectAdapter) super.getAdapter();
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackSupportFragmentTest.java b/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackSupportFragmentTest.java
index e32d90b..b21ea01 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackSupportFragmentTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackSupportFragmentTest.java
@@ -58,6 +58,7 @@
final PlaybackTestSupportFragment fragment = (PlaybackTestSupportFragment) mActivity.getTestFragment();
PlaybackGlue glue = fragment.getGlue();
activityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mActivity.finish();
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackTestFragment.java b/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackTestFragment.java
index 51c2c10..99a7fc6 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackTestFragment.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackTestFragment.java
@@ -62,6 +62,7 @@
private ListRowPresenter mListRowPresenter;
boolean mDestroyCalled;
+ @Override
public SparseArrayObjectAdapter getAdapter() {
return (SparseArrayObjectAdapter) super.getAdapter();
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackTestSupportFragment.java b/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackTestSupportFragment.java
index 1234421..ef99eb6 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackTestSupportFragment.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/PlaybackTestSupportFragment.java
@@ -65,6 +65,7 @@
private ListRowPresenter mListRowPresenter;
boolean mDestroyCalled;
+ @Override
public SparseArrayObjectAdapter getAdapter() {
return (SparseArrayObjectAdapter) super.getAdapter();
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/RowsFragmentTest.java b/v17/leanback/tests/java/android/support/v17/leanback/app/RowsFragmentTest.java
index 193203e..80cdb8c 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/RowsFragmentTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/RowsFragmentTest.java
@@ -217,6 +217,7 @@
InstrumentationRegistry.getInstrumentation().runOnMainSync(
new Runnable() {
+ @Override
public void run() {
mActivity.recreate();
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/RowsSupportFragmentTest.java b/v17/leanback/tests/java/android/support/v17/leanback/app/RowsSupportFragmentTest.java
index 70ddbac..2a00f71 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/RowsSupportFragmentTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/RowsSupportFragmentTest.java
@@ -220,6 +220,7 @@
InstrumentationRegistry.getInstrumentation().runOnMainSync(
new Runnable() {
+ @Override
public void run() {
mActivity.recreate();
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/SingleFragmentTestBase.java b/v17/leanback/tests/java/android/support/v17/leanback/app/SingleFragmentTestBase.java
index 6c1f5bc..561facb 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/SingleFragmentTestBase.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/SingleFragmentTestBase.java
@@ -42,6 +42,7 @@
if (activity != null) {
mActivity = null;
activityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
activity.finish();
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/SingleSupportFragmentTestBase.java b/v17/leanback/tests/java/android/support/v17/leanback/app/SingleSupportFragmentTestBase.java
index 9c872f8..3083ecf 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/SingleSupportFragmentTestBase.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/SingleSupportFragmentTestBase.java
@@ -45,6 +45,7 @@
if (activity != null) {
mActivity = null;
activityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
activity.finish();
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/VerticalGridFragmentTest.java b/v17/leanback/tests/java/android/support/v17/leanback/app/VerticalGridFragmentTest.java
index 5c4f4fd..2a56acd 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/VerticalGridFragmentTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/VerticalGridFragmentTest.java
@@ -50,6 +50,7 @@
launchAndWaitActivity(GridFragment.class, 500);
InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+ @Override
public void run() {
GridFragment f = new GridFragment();
mActivity.getFragmentManager().beginTransaction()
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/VerticalGridSupportFragmentTest.java b/v17/leanback/tests/java/android/support/v17/leanback/app/VerticalGridSupportFragmentTest.java
index 8b58c33..f6d0a1b 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/VerticalGridSupportFragmentTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/VerticalGridSupportFragmentTest.java
@@ -53,6 +53,7 @@
launchAndWaitActivity(GridFragment.class, 500);
InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+ @Override
public void run() {
GridFragment f = new GridFragment();
mActivity.getSupportFragmentManager().beginTransaction()
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/widget/GridWidgetTest.java b/v17/leanback/tests/java/android/support/v17/leanback/widget/GridWidgetTest.java
index 1f4bf3d..0f1f502 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/widget/GridWidgetTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/widget/GridWidgetTest.java
@@ -82,6 +82,7 @@
protected int[] mRemovedItems;
private final Comparator<View> mRowSortComparator = new Comparator<View>() {
+ @Override
public int compare(View lhs, View rhs) {
if (mOrientation == BaseGridView.HORIZONTAL) {
return lhs.getLeft() - rhs.getLeft();
@@ -121,6 +122,7 @@
*/
private void changeArraySize(final int size) throws Throwable {
performAndWaitForAnimation(new Runnable() {
+ @Override
public void run() {
mActivity.changeArraySize(size);
}
@@ -141,6 +143,7 @@
*/
private void setSelectedPosition(final int position, final int scrollExtra) throws Throwable {
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPosition(position, scrollExtra);
}
@@ -356,6 +359,7 @@
mActivityTestRule = new ActivityTestRule<GridActivity>(GridActivity.class, false, false);
mActivity = mActivityTestRule.launchActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mActivity.setTitle(testName.getMethodName());
}
@@ -547,6 +551,7 @@
final int decorationBottom = 2;
performAndWaitForAnimation(new Runnable() {
+ @Override
public void run() {
mGridView.addItemDecoration(new DividerDecoration(decorationLeft, decorationTop,
decorationRight, decorationBottom));
@@ -614,6 +619,7 @@
assertTrue(opticalInsetsBottom > 0);
performAndWaitForAnimation(new Runnable() {
+ @Override
public void run() {
mGridView.addItemDecoration(new DividerDecoration(decorationLeft, decorationTop,
decorationRight, decorationBottom));
@@ -841,16 +847,19 @@
final int focusToIndex = 49;
final ViewGroup parent = (ViewGroup) mGridView.getParent();
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
parent.removeView(mGridView);
}
});
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(focusToIndex);
}
});
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
parent.addView(mGridView);
mGridView.requestFocus();
@@ -862,16 +871,19 @@
final int focusToIndex2 = 0;
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
parent.removeView(mGridView);
}
});
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPosition(focusToIndex2);
}
});
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
parent.addView(mGridView);
mGridView.requestFocus();
@@ -895,6 +907,7 @@
final int focusToIndex = mGridView.getChildCount() - 1;
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(focusToIndex);
}
@@ -902,6 +915,7 @@
waitForScrollIdle();
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(focusToIndex + 1);
}
@@ -909,6 +923,7 @@
// let the scroll running for a while and requestLayout during scroll
Thread.sleep(80);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
assertEquals(mGridView.getScrollState(), BaseGridView.SCROLL_STATE_SETTLING);
mGridView.requestLayout();
@@ -919,6 +934,7 @@
int leftEdge = mGridView.getLayoutManager().findViewByPosition(focusToIndex).getLeft();
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.requestLayout();
}
@@ -941,6 +957,7 @@
final int focusToIndex = mGridView.getChildCount() - 1;
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(focusToIndex);
}
@@ -957,6 +974,7 @@
int leftEdge = mGridView.getLayoutManager().findViewByPosition(focusToIndex).getLeft();
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.requestLayout();
}
@@ -984,6 +1002,7 @@
initActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(150);
}
@@ -993,6 +1012,7 @@
View view = mGridView.getChildAt(mGridView.getChildCount() - 1);
final int focusToIndex = mGridView.getChildAdapterPosition(view);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(focusToIndex);
}
@@ -1025,6 +1045,7 @@
initActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(150);
}
@@ -1034,6 +1055,7 @@
View view = mGridView.getChildAt(mGridView.getChildCount() - 1);
final int focusToIndex = mGridView.getChildAdapterPosition(view);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(focusToIndex);
}
@@ -1061,12 +1083,14 @@
final int focusToIndex = 40;
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(focusToIndex);
}
});
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mActivity.removeItems(focusToIndex, 1);
}
@@ -1078,6 +1102,7 @@
int leftEdge = mGridView.getLayoutManager().findViewByPosition(focusToIndex).getLeft();
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.requestLayout();
}
@@ -1100,6 +1125,7 @@
final int focusToIndex = 40;
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(focusToIndex);
}
@@ -1107,6 +1133,7 @@
startWaitLayout();
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
final int removeIndex = mGridView.getChildViewHolder(
mGridView.getChildAt(mGridView.getChildCount() - 1)).getAdapterPosition();
@@ -1121,6 +1148,7 @@
int leftEdge = mGridView.getLayoutManager().findViewByPosition(focusToIndex).getLeft();
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.requestLayout();
}
@@ -1159,6 +1187,7 @@
assertTrue(mGridView.getLayoutManager().isSmoothScrolling());
startWaitLayout();
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
final int removeIndex = mGridView.getChildViewHolder(
mGridView.getChildAt(mGridView.getChildCount() - 1)).getAdapterPosition();
@@ -1175,6 +1204,7 @@
int topEdge = mGridView.getLayoutManager().findViewByPosition(focusIndex).getTop();
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.requestLayout();
}
@@ -1196,6 +1226,7 @@
mNumRows = 3;
performAndWaitForAnimation(new Runnable() {
+ @Override
public void run() {
mRemovedItems = mActivity.removeItems(0, 200);
}
@@ -1203,6 +1234,7 @@
humanDelay(500);
performAndWaitForAnimation(new Runnable() {
+ @Override
public void run() {
mActivity.addItems(0, mRemovedItems);
}
@@ -1673,6 +1705,7 @@
final boolean[] scrolled = new boolean[]{false};
mGridView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+ @Override
public void onScrolled(RecyclerView recyclerView, int dx, int dy){
if (dy > 0) {
scrolled[0] = true;
@@ -1705,6 +1738,7 @@
initActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(3);
}
@@ -1745,6 +1779,7 @@
// scroll to invisible item that is far away.
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(100);
}
@@ -1772,6 +1807,7 @@
initActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(10);
}
@@ -1813,6 +1849,7 @@
// scroll to invisible item that is far away.
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(200);
}
@@ -1875,6 +1912,7 @@
initActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(10);
}
@@ -1916,6 +1954,7 @@
// scroll to invisible item that is far away.
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(200);
}
@@ -1943,6 +1982,7 @@
initActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(30);
}
@@ -1982,6 +2022,7 @@
initActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(10);
}
@@ -2021,6 +2062,7 @@
initActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(99);
}
@@ -2030,12 +2072,14 @@
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(50);
}
});
Thread.sleep(100);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.requestLayout();
mGridView.setSelectedPositionSmooth(0);
@@ -2102,6 +2146,7 @@
int targetPosition = items.length - 1;
mGridView.setSelectedPositionSmooth(targetPosition);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.stopScroll();
}
@@ -2135,6 +2180,7 @@
mActivity.addItems(items.length, new int[]{300});
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
((VerticalGridView) mGridView).setNumColumns(2);
}
@@ -2163,6 +2209,7 @@
initActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(1);
}
@@ -2194,6 +2241,7 @@
initActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(0);
}
@@ -2202,6 +2250,7 @@
verifyMargin();
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(1);
}
@@ -2226,6 +2275,7 @@
initActivity(intent);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mActivity.attachToNewAdapter(new int[0]);
}
@@ -2275,6 +2325,7 @@
// 1 Save view states
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
Selection.setSelection((Spannable)(((TextView) mGridView.getChildAt(0))
.getText()), 0, 1);
@@ -2286,6 +2337,7 @@
// 2 Change view states
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
Selection.setSelection((Spannable)(((TextView) mGridView.getChildAt(0))
.getText()), 1, 2);
@@ -2296,6 +2348,7 @@
// 3 Detached and re-attached, should still maintain state of (2)
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(1);
}
@@ -2308,12 +2361,14 @@
// 4 Recycled and rebound, should load state from (2)
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(20);
}
});
waitForScrollIdle(mVerifyLayout);
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setSelectedPositionSmooth(0);
}
@@ -2347,6 +2402,7 @@
// 1. Set text selection, save view states should do nothing on child
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
for (int i = 0; i < mGridView.getChildCount(); i++) {
Selection.setSelection((Spannable)(((TextView) mGridView.getChildAt(i))
@@ -2358,6 +2414,7 @@
// 2. clear the text selection
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
for (int i = 0; i < mGridView.getChildCount(); i++) {
Selection.removeSelection((Spannable)(((TextView) mGridView.getChildAt(i))
@@ -2368,6 +2425,7 @@
// 3. Restore view states should be a no-op for child
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.restoreHierarchyState(container);
for (int i = 0; i < mGridView.getChildCount(); i++) {
@@ -2620,6 +2678,7 @@
mNumRows = 1;
performAndWaitForAnimation(new Runnable() {
+ @Override
public void run() {
mActivity.addItems(0, new int[]{300, 300});
mGridView.setSelectedPosition(0);
@@ -2650,11 +2709,13 @@
final View firstView = mGridView.getLayoutManager().findViewByPosition(0);
final View[] selectedViewByTask = new View[1];
final ViewHolderTask task = new ViewHolderTask() {
+ @Override
public void run(RecyclerView.ViewHolder viewHolder) {
selectedViewByTask[0] = viewHolder.itemView;
}
};
performAndWaitForAnimation(new Runnable() {
+ @Override
public void run() {
mActivity.removeItems(0, 1);
if (smooth) {
@@ -2685,12 +2746,14 @@
final ArrayList<Integer> selectedLog = new ArrayList<Integer>();
mGridView.setOnChildSelectedListener(new OnChildSelectedListener() {
+ @Override
public void onChildSelected(ViewGroup parent, View view, int position, long id) {
selectedLog.add(position);
}
});
performAndWaitForAnimation(new Runnable() {
+ @Override
public void run() {
ChangeableViewTypesProvider.setViewType(0, 1);
mGridView.getAdapter().notifyItemChanged(0, 1);
@@ -2712,6 +2775,7 @@
mNumRows = 1;
performAndWaitForAnimation(new Runnable() {
+ @Override
public void run() {
mActivity.addItems(0, new int[]{300, 300});
mGridView.setSelectedPositionSmooth(0);
@@ -2737,6 +2801,7 @@
// add extra layout space
startWaitLayout();
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setExtraLayoutSpace(extraLayoutSize);
}
@@ -2755,6 +2820,7 @@
// clear extra layout space
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.setExtraLayoutSpace(0);
verifyMargin();
@@ -2906,6 +2972,7 @@
// item0 and item2 for the best match of focusSearch(FOCUS_LEFT). The grid widget
// must override default addFocusables(), not to add item0 or item2.
mActivity.mAdapterListener = new GridActivity.AdapterListener() {
+ @Override
public void onBind(RecyclerView.ViewHolder vh, int position) {
if (position == 1) {
vh.itemView.setPaddingRelative(500, 0, 0, 0);
@@ -2995,6 +3062,7 @@
void slideInAndWaitIdle(long timeout) throws Throwable {
// animateIn() would reset position
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.animateIn();
}
@@ -3028,6 +3096,7 @@
mGridView.getChildAt(0).getTop());
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.animateOut();
}
@@ -3041,6 +3110,7 @@
});
// scrollToPosition() should not affect slideOut status
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.scrollToPosition(0);
}
@@ -3079,6 +3149,7 @@
mGridView.getChildAt(0).getTop());
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.animateOut();
}
@@ -3092,6 +3163,7 @@
});
// smoothScrollToPosition() should not affect slideOut status
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.smoothScrollToPosition(29);
}
@@ -3131,6 +3203,7 @@
mGridView.getChildAt(0).getTop());
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.animateOut();
}
@@ -3144,6 +3217,7 @@
});
// smoothScrollToPosition() should not affect slideOut status
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.scrollToPosition(29);
}
@@ -3183,6 +3257,7 @@
mGridView.getChildAt(0).getTop());
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.animateOut();
}
@@ -3196,6 +3271,7 @@
});
// change adapter should not affect slideOut status
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mActivity.changeItem(0, 200);
}
@@ -3243,6 +3319,7 @@
mGridView.getChildAt(0).getTop());
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.animateOut();
mActivity.findViewById(R.id.button).requestFocus();
@@ -3256,6 +3333,7 @@
}
});
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.requestFocus();
}
@@ -3294,6 +3372,7 @@
mGridView.getChildAt(0).getLeft());
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.animateOut();
}
@@ -3305,6 +3384,7 @@
}
});
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.scrollToPosition(0);
}
@@ -3346,6 +3426,7 @@
mGridView.getChildAt(0).getRight());
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.animateOut();
}
@@ -3358,6 +3439,7 @@
}
});
mActivityTestRule.runOnUiThread(new Runnable() {
+ @Override
public void run() {
mGridView.smoothScrollToPosition(0);
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxFloatEffectTest.java b/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxFloatEffectTest.java
index 0c98e7d..eca3b9a 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxFloatEffectTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxFloatEffectTest.java
@@ -46,6 +46,7 @@
MockitoAnnotations.initMocks(this);
mSource = new Parallax.FloatParallax<Parallax.FloatProperty>() {
+ @Override
public float getMaxValue() {
return mScreenMax;
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxFloatTest.java b/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxFloatTest.java
index a2b00b9..23b8b5c 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxFloatTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxFloatTest.java
@@ -43,6 +43,7 @@
public void setUp() throws Exception {
mSource = new Parallax.FloatParallax<Parallax.FloatProperty>() {
+ @Override
public float getMaxValue() {
return mScreenMax;
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxIntEffectTest.java b/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxIntEffectTest.java
index 02b3f69..398a0a8 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxIntEffectTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxIntEffectTest.java
@@ -43,6 +43,7 @@
MockitoAnnotations.initMocks(this);
mSource = new Parallax.IntParallax<Parallax.IntProperty>() {
+ @Override
public int getMaxValue() {
return mScreenMax;
}
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxIntTest.java b/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxIntTest.java
index 84fadbd0..e8269ad 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxIntTest.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/widget/ParallaxIntTest.java
@@ -40,6 +40,7 @@
public void setUp() throws Exception {
mSource = new Parallax.IntParallax<Parallax.IntProperty>() {
+ @Override
public int getMaxValue() {
return mScreenMax;
}
diff --git a/v7/appcompat/src/android/support/v7/app/AppCompatDialog.java b/v7/appcompat/src/android/support/v7/app/AppCompatDialog.java
index dd0a4a5..2ac7c99 100644
--- a/v7/appcompat/src/android/support/v7/app/AppCompatDialog.java
+++ b/v7/appcompat/src/android/support/v7/app/AppCompatDialog.java
@@ -143,6 +143,7 @@
/**
* @hide
*/
+ @Override
@RestrictTo(LIBRARY_GROUP)
public void invalidateOptionsMenu() {
getDelegate().invalidateOptionsMenu();
diff --git a/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java b/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
index 4776812..c124bc9 100644
--- a/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
+++ b/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
@@ -491,14 +491,17 @@
mDecorToolbar.getViewGroup().removeCallbacks(mMenuInvalidator);
}
+ @Override
public void addOnMenuVisibilityListener(OnMenuVisibilityListener listener) {
mMenuVisibilityListeners.add(listener);
}
+ @Override
public void removeOnMenuVisibilityListener(OnMenuVisibilityListener listener) {
mMenuVisibilityListeners.remove(listener);
}
+ @Override
public void dispatchMenuVisibilityChanged(boolean isVisible) {
if (isVisible == mLastMenuVisibility) {
return;
diff --git a/v7/appcompat/src/android/support/v7/app/WindowDecorActionBar.java b/v7/appcompat/src/android/support/v7/app/WindowDecorActionBar.java
index 3326874..39ff508 100644
--- a/v7/appcompat/src/android/support/v7/app/WindowDecorActionBar.java
+++ b/v7/appcompat/src/android/support/v7/app/WindowDecorActionBar.java
@@ -257,6 +257,7 @@
return ViewCompat.getElevation(mContainerView);
}
+ @Override
public void onConfigurationChanged(Configuration newConfig) {
setHasEmbeddedTabs(ActionBarPolicy.get(mContext).hasEmbeddedTabs());
}
@@ -318,6 +319,7 @@
}
}
+ @Override
public void onWindowVisibilityChanged(int visibility) {
mCurWindowVisibility = visibility;
}
@@ -329,6 +331,7 @@
*
* @param enabled true to animate, false to not animate.
*/
+ @Override
public void setShowHideAnimationEnabled(boolean enabled) {
mShowHideAnimationEnabled = enabled;
if (!enabled && mCurrentShowAnim != null) {
@@ -336,14 +339,17 @@
}
}
+ @Override
public void addOnMenuVisibilityListener(OnMenuVisibilityListener listener) {
mMenuVisibilityListeners.add(listener);
}
+ @Override
public void removeOnMenuVisibilityListener(OnMenuVisibilityListener listener) {
mMenuVisibilityListeners.remove(listener);
}
+ @Override
public void dispatchMenuVisibilityChanged(boolean isVisible) {
if (isVisible == mLastMenuVisibility) {
return;
@@ -402,6 +408,7 @@
setSubtitle(mContext.getString(resId));
}
+ @Override
public void setSelectedNavigationItem(int position) {
switch (mDecorToolbar.getNavigationMode()) {
case NAVIGATION_MODE_TABS:
@@ -416,6 +423,7 @@
}
}
+ @Override
public void removeAllTabs() {
cleanupTabs();
}
@@ -431,6 +439,7 @@
mSavedTabPosition = INVALID_POSITION;
}
+ @Override
public void setTitle(CharSequence title) {
mDecorToolbar.setTitle(title);
}
@@ -450,10 +459,12 @@
return false;
}
+ @Override
public void setSubtitle(CharSequence subtitle) {
mDecorToolbar.setSubtitle(subtitle);
}
+ @Override
public void setDisplayOptions(int options) {
if ((options & DISPLAY_HOME_AS_UP) != 0) {
mDisplayHomeAsUpSet = true;
@@ -461,6 +472,7 @@
mDecorToolbar.setDisplayOptions(options);
}
+ @Override
public void setDisplayOptions(int options, int mask) {
final int current = mDecorToolbar.getDisplayOptions();
if ((mask & DISPLAY_HOME_AS_UP) != 0) {
@@ -469,38 +481,47 @@
mDecorToolbar.setDisplayOptions((options & mask) | (current & ~mask));
}
+ @Override
public void setBackgroundDrawable(Drawable d) {
mContainerView.setPrimaryBackground(d);
}
+ @Override
public void setStackedBackgroundDrawable(Drawable d) {
mContainerView.setStackedBackground(d);
}
+ @Override
public void setSplitBackgroundDrawable(Drawable d) {
// no-op. We don't support split action bars
}
+ @Override
public View getCustomView() {
return mDecorToolbar.getCustomView();
}
+ @Override
public CharSequence getTitle() {
return mDecorToolbar.getTitle();
}
+ @Override
public CharSequence getSubtitle() {
return mDecorToolbar.getSubtitle();
}
+ @Override
public int getNavigationMode() {
return mDecorToolbar.getNavigationMode();
}
+ @Override
public int getDisplayOptions() {
return mDecorToolbar.getDisplayOptions();
}
+ @Override
public ActionMode startActionMode(ActionMode.Callback callback) {
if (mActionMode != null) {
mActionMode.finish();
@@ -651,6 +672,7 @@
return mContainerView.getHeight();
}
+ @Override
public void enableContentAnimations(boolean enabled) {
mContentAnimations = enabled;
}
@@ -673,6 +695,7 @@
}
}
+ @Override
public void showForSystem() {
if (mHiddenBySystem) {
mHiddenBySystem = false;
@@ -698,6 +721,7 @@
}
}
+ @Override
public void hideForSystem() {
if (!mHiddenBySystem) {
mHiddenBySystem = true;
@@ -845,6 +869,7 @@
}
}
+ @Override
public boolean isShowing() {
final int height = getHeight();
// Take into account the case where the bar has a 0 height due to not being measured yet.
@@ -896,6 +921,7 @@
return ViewCompat.isLaidOut(mContainerView);
}
+ @Override
public Context getThemedContext() {
if (mThemedContext == null) {
TypedValue outValue = new TypedValue();
@@ -1096,6 +1122,7 @@
return mCustomView != null ? mCustomView.get() : null;
}
+ @Override
public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
if (mCallback != null) {
return mCallback.onActionItemClicked(this, item);
@@ -1123,6 +1150,7 @@
public void onCloseSubMenu(SubMenuBuilder menu) {
}
+ @Override
public void onMenuModeChange(MenuBuilder menu) {
if (mCallback == null) {
return;
@@ -1367,6 +1395,7 @@
return mDecorToolbar.hasLogo();
}
+ @Override
public void setDefaultDisplayHomeAsUpEnabled(boolean enable) {
if (!mDisplayHomeAsUpSet) {
setDisplayHomeAsUpEnabled(enable);
diff --git a/v7/appcompat/src/android/support/v7/graphics/drawable/DrawableWrapper.java b/v7/appcompat/src/android/support/v7/graphics/drawable/DrawableWrapper.java
index 9fa45b8..b2406ac 100644
--- a/v7/appcompat/src/android/support/v7/graphics/drawable/DrawableWrapper.java
+++ b/v7/appcompat/src/android/support/v7/graphics/drawable/DrawableWrapper.java
@@ -101,6 +101,7 @@
return mDrawable.getState();
}
+ @Override
public void jumpToCurrentState() {
DrawableCompat.jumpToCurrentState(mDrawable);
}
@@ -153,6 +154,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void invalidateDrawable(Drawable who) {
invalidateSelf();
}
@@ -160,6 +162,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void scheduleDrawable(Drawable who, Runnable what, long when) {
scheduleSelf(what, when);
}
@@ -167,6 +170,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void unscheduleDrawable(Drawable who, Runnable what) {
unscheduleSelf(what);
}
diff --git a/v7/appcompat/src/android/support/v7/view/StandaloneActionMode.java b/v7/appcompat/src/android/support/v7/view/StandaloneActionMode.java
index 05aff39..bfe98d0 100644
--- a/v7/appcompat/src/android/support/v7/view/StandaloneActionMode.java
+++ b/v7/appcompat/src/android/support/v7/view/StandaloneActionMode.java
@@ -135,6 +135,7 @@
return new SupportMenuInflater(mContextView.getContext());
}
+ @Override
public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
return mCallback.onActionItemClicked(this, item);
}
@@ -154,11 +155,13 @@
public void onCloseSubMenu(SubMenuBuilder menu) {
}
+ @Override
public void onMenuModeChange(MenuBuilder menu) {
invalidate();
mContextView.showOverflowMenu();
}
+ @Override
public boolean isUiFocusable() {
return mFocusable;
}
diff --git a/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java b/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java
index 7f6424f..60f0f9e 100644
--- a/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java
+++ b/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java
@@ -251,6 +251,7 @@
}
}
+ @Override
public boolean onMenuItemClick(MenuItem item) {
try {
if (mMethod.getReturnType() == Boolean.TYPE) {
diff --git a/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItem.java b/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItem.java
index bb44131..b3278a4 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItem.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItem.java
@@ -76,75 +76,93 @@
mTitle = title;
}
+ @Override
public char getAlphabeticShortcut() {
return mShortcutAlphabeticChar;
}
+ @Override
public int getGroupId() {
return mGroup;
}
+ @Override
public Drawable getIcon() {
return mIconDrawable;
}
+ @Override
public Intent getIntent() {
return mIntent;
}
+ @Override
public int getItemId() {
return mId;
}
+ @Override
public ContextMenuInfo getMenuInfo() {
return null;
}
+ @Override
public char getNumericShortcut() {
return mShortcutNumericChar;
}
+ @Override
public int getOrder() {
return mOrdering;
}
+ @Override
public SubMenu getSubMenu() {
return null;
}
+ @Override
public CharSequence getTitle() {
return mTitle;
}
+ @Override
public CharSequence getTitleCondensed() {
return mTitleCondensed != null ? mTitleCondensed : mTitle;
}
+ @Override
public boolean hasSubMenu() {
return false;
}
+ @Override
public boolean isCheckable() {
return (mFlags & CHECKABLE) != 0;
}
+ @Override
public boolean isChecked() {
return (mFlags & CHECKED) != 0;
}
+ @Override
public boolean isEnabled() {
return (mFlags & ENABLED) != 0;
}
+ @Override
public boolean isVisible() {
return (mFlags & HIDDEN) == 0;
}
+ @Override
public MenuItem setAlphabeticShortcut(char alphaChar) {
mShortcutAlphabeticChar = alphaChar;
return this;
}
+ @Override
public MenuItem setCheckable(boolean checkable) {
mFlags = (mFlags & ~CHECKABLE) | (checkable ? CHECKABLE : 0);
return this;
@@ -155,64 +173,76 @@
return this;
}
+ @Override
public MenuItem setChecked(boolean checked) {
mFlags = (mFlags & ~CHECKED) | (checked ? CHECKED : 0);
return this;
}
+ @Override
public MenuItem setEnabled(boolean enabled) {
mFlags = (mFlags & ~ENABLED) | (enabled ? ENABLED : 0);
return this;
}
+ @Override
public MenuItem setIcon(Drawable icon) {
mIconDrawable = icon;
mIconResId = NO_ICON;
return this;
}
+ @Override
public MenuItem setIcon(int iconRes) {
mIconResId = iconRes;
mIconDrawable = ContextCompat.getDrawable(mContext, iconRes);
return this;
}
+ @Override
public MenuItem setIntent(Intent intent) {
mIntent = intent;
return this;
}
+ @Override
public MenuItem setNumericShortcut(char numericChar) {
mShortcutNumericChar = numericChar;
return this;
}
+ @Override
public MenuItem setOnMenuItemClickListener(OnMenuItemClickListener menuItemClickListener) {
mClickListener = menuItemClickListener;
return this;
}
+ @Override
public MenuItem setShortcut(char numericChar, char alphaChar) {
mShortcutNumericChar = numericChar;
mShortcutAlphabeticChar = alphaChar;
return this;
}
+ @Override
public MenuItem setTitle(CharSequence title) {
mTitle = title;
return this;
}
+ @Override
public MenuItem setTitle(int title) {
mTitle = mContext.getResources().getString(title);
return this;
}
+ @Override
public MenuItem setTitleCondensed(CharSequence title) {
mTitleCondensed = title;
return this;
}
+ @Override
public MenuItem setVisible(boolean visible) {
mFlags = (mFlags & HIDDEN) | (visible ? 0 : HIDDEN);
return this;
@@ -231,14 +261,17 @@
return false;
}
+ @Override
public void setShowAsAction(int show) {
// Do nothing. ActionMenuItems always show as action buttons.
}
+ @Override
public SupportMenuItem setActionView(View actionView) {
throw new UnsupportedOperationException();
}
+ @Override
public View getActionView() {
return null;
}
diff --git a/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItemView.java b/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItemView.java
index b87e9c63..989e609 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItemView.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItemView.java
@@ -86,6 +86,7 @@
setSaveEnabled(false);
}
+ @Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
@@ -112,10 +113,12 @@
super.setPadding(l, t, r, b);
}
+ @Override
public MenuItemImpl getItemData() {
return mItemData;
}
+ @Override
public void initialize(MenuItemImpl itemData, int menuType) {
mItemData = itemData;
@@ -156,14 +159,17 @@
mPopupCallback = popupCallback;
}
+ @Override
public boolean prefersCondensedTitle() {
return true;
}
+ @Override
public void setCheckable(boolean checkable) {
// TODO Support checkable action items
}
+ @Override
public void setChecked(boolean checked) {
// TODO Support checkable action items
}
@@ -202,6 +208,7 @@
}
}
+ @Override
public void setIcon(Drawable icon) {
mIcon = icon;
if (icon != null) {
@@ -228,24 +235,29 @@
return !TextUtils.isEmpty(getText());
}
+ @Override
public void setShortcut(boolean showShortcut, char shortcutKey) {
// Action buttons don't show text for shortcut keys.
}
+ @Override
public void setTitle(CharSequence title) {
mTitle = title;
updateTextButtonVisibility();
}
+ @Override
public boolean showsIcon() {
return true;
}
+ @Override
public boolean needsDividerBefore() {
return hasText() && mItemData.getIcon() == null;
}
+ @Override
public boolean needsDividerAfter() {
return hasText();
}
diff --git a/v7/appcompat/src/android/support/v7/view/menu/BaseMenuPresenter.java b/v7/appcompat/src/android/support/v7/view/menu/BaseMenuPresenter.java
index ff83ae4..1e89ad2 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/BaseMenuPresenter.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/BaseMenuPresenter.java
@@ -85,6 +85,7 @@
/**
* Reuses item views when it can
*/
+ @Override
public void updateMenuView(boolean cleared) {
final ViewGroup parent = (ViewGroup) mMenuView;
if (parent == null) return;
@@ -147,6 +148,7 @@
return true;
}
+ @Override
public void setCallback(Callback cb) {
mCallback = cb;
}
@@ -205,12 +207,14 @@
return true;
}
+ @Override
public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
if (mCallback != null) {
mCallback.onCloseMenu(menu, allMenusAreClosing);
}
}
+ @Override
public boolean onSubMenuSelected(SubMenuBuilder menu) {
if (mCallback != null) {
return mCallback.onOpenSubMenu(menu);
@@ -218,18 +222,22 @@
return false;
}
+ @Override
public boolean flagActionItems() {
return false;
}
+ @Override
public boolean expandItemActionView(MenuBuilder menu, MenuItemImpl item) {
return false;
}
+ @Override
public boolean collapseItemActionView(MenuBuilder menu, MenuItemImpl item) {
return false;
}
+ @Override
public int getId() {
return mId;
}
diff --git a/v7/appcompat/src/android/support/v7/view/menu/ListMenuItemView.java b/v7/appcompat/src/android/support/v7/view/menu/ListMenuItemView.java
index 855cee2..455eeed 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/ListMenuItemView.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/ListMenuItemView.java
@@ -104,6 +104,7 @@
}
}
+ @Override
public void initialize(MenuItemImpl itemData, int menuType) {
mItemData = itemData;
mMenuType = menuType;
@@ -123,6 +124,7 @@
mPreserveIconSpacing = mForceShowIcon = forceShow;
}
+ @Override
public void setTitle(CharSequence title) {
if (title != null) {
mTitleView.setText(title);
@@ -133,10 +135,12 @@
}
}
+ @Override
public MenuItemImpl getItemData() {
return mItemData;
}
+ @Override
public void setCheckable(boolean checkable) {
if (!checkable && mRadioButton == null && mCheckBox == null) {
return;
@@ -183,6 +187,7 @@
}
}
+ @Override
public void setChecked(boolean checked) {
CompoundButton compoundButton;
@@ -207,6 +212,7 @@
}
}
+ @Override
public void setShortcut(boolean showShortcut, char shortcutKey) {
final int newVisibility = (showShortcut && mItemData.shouldShowShortcut())
? VISIBLE : GONE;
@@ -220,6 +226,7 @@
}
}
+ @Override
public void setIcon(Drawable icon) {
final boolean showIcon = mItemData.shouldShowIcon() || mForceShowIcon;
if (!showIcon && !mPreserveIconSpacing) {
@@ -281,10 +288,12 @@
addView(mCheckBox);
}
+ @Override
public boolean prefersCondensedTitle() {
return false;
}
+ @Override
public boolean showsIcon() {
return mForceShowIcon;
}
diff --git a/v7/appcompat/src/android/support/v7/view/menu/ListMenuPresenter.java b/v7/appcompat/src/android/support/v7/view/menu/ListMenuPresenter.java
index 41d5576..e3179f4 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/ListMenuPresenter.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/ListMenuPresenter.java
@@ -177,10 +177,12 @@
return false;
}
+ @Override
public boolean expandItemActionView(MenuBuilder menu, MenuItemImpl item) {
return false;
}
+ @Override
public boolean collapseItemActionView(MenuBuilder menu, MenuItemImpl item) {
return false;
}
@@ -232,6 +234,7 @@
findExpandedIndex();
}
+ @Override
public int getCount() {
ArrayList<MenuItemImpl> items = mMenu.getNonActionItems();
int count = items.size() - mItemIndexOffset;
@@ -241,6 +244,7 @@
return count - 1;
}
+ @Override
public MenuItemImpl getItem(int position) {
ArrayList<MenuItemImpl> items = mMenu.getNonActionItems();
position += mItemIndexOffset;
@@ -250,12 +254,14 @@
return items.get(position);
}
+ @Override
public long getItemId(int position) {
// Since a menu item's ID is optional, we'll use the position as an
// ID for the item in the AdapterView
return position;
}
+ @Override
public View getView(int position, View convertView, ViewGroup parent) {
if (convertView == null) {
convertView = mInflater.inflate(mItemLayoutRes, parent, false);
diff --git a/v7/appcompat/src/android/support/v7/view/menu/MenuBuilder.java b/v7/appcompat/src/android/support/v7/view/menu/MenuBuilder.java
index 5f82161..3adfd87 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/MenuBuilder.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/MenuBuilder.java
@@ -460,6 +460,7 @@
defaultShowAsAction);
}
+ @Override
public MenuItem add(CharSequence title) {
return addInternal(0, 0, 0, title);
}
diff --git a/v7/appcompat/src/android/support/v7/view/menu/MenuDialogHelper.java b/v7/appcompat/src/android/support/v7/view/menu/MenuDialogHelper.java
index 6e4036f..eaf7c82 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/MenuDialogHelper.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/MenuDialogHelper.java
@@ -88,6 +88,7 @@
mDialog.show();
}
+ @Override
public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_MENU || keyCode == KeyEvent.KEYCODE_BACK) {
if (event.getAction() == KeyEvent.ACTION_DOWN
@@ -162,6 +163,7 @@
return false;
}
+ @Override
public void onClick(DialogInterface dialog, int which) {
mMenu.performItemAction((MenuItemImpl) mPresenter.getAdapter().getItem(which), 0);
}
diff --git a/v7/appcompat/src/android/support/v7/view/menu/SubMenuBuilder.java b/v7/appcompat/src/android/support/v7/view/menu/SubMenuBuilder.java
index fdd1b14..94300ed 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/SubMenuBuilder.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/SubMenuBuilder.java
@@ -68,6 +68,7 @@
return mParentMenu;
}
+ @Override
public MenuItem getItem() {
return mItem;
}
@@ -88,32 +89,39 @@
mParentMenu.dispatchMenuItemSelected(menu, item);
}
+ @Override
public SubMenu setIcon(Drawable icon) {
mItem.setIcon(icon);
return this;
}
+ @Override
public SubMenu setIcon(int iconRes) {
mItem.setIcon(iconRes);
return this;
}
+ @Override
public SubMenu setHeaderIcon(Drawable icon) {
return (SubMenu) super.setHeaderIconInt(icon);
}
+ @Override
public SubMenu setHeaderIcon(int iconRes) {
return (SubMenu) super.setHeaderIconInt(iconRes);
}
+ @Override
public SubMenu setHeaderTitle(CharSequence title) {
return (SubMenu) super.setHeaderTitleInt(title);
}
+ @Override
public SubMenu setHeaderTitle(int titleRes) {
return (SubMenu) super.setHeaderTitleInt(titleRes);
}
+ @Override
public SubMenu setHeaderView(View view) {
return (SubMenu) super.setHeaderViewInt(view);
}
diff --git a/v7/appcompat/src/android/support/v7/widget/AbsActionBarView.java b/v7/appcompat/src/android/support/v7/widget/AbsActionBarView.java
index bab60c4..58a130c 100644
--- a/v7/appcompat/src/android/support/v7/widget/AbsActionBarView.java
+++ b/v7/appcompat/src/android/support/v7/widget/AbsActionBarView.java
@@ -198,6 +198,7 @@
public void postShowOverflowMenu() {
post(new Runnable() {
+ @Override
public void run() {
showOverflowMenu();
}
diff --git a/v7/appcompat/src/android/support/v7/widget/ActionBarContainer.java b/v7/appcompat/src/android/support/v7/widget/ActionBarContainer.java
index de4484c..eff105e 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActionBarContainer.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActionBarContainer.java
@@ -169,6 +169,7 @@
}
}
+ @Override
public void jumpDrawablesToCurrentState() {
if (Build.VERSION.SDK_INT >= 11) {
super.jumpDrawablesToCurrentState();
@@ -228,12 +229,14 @@
return mTabContainer;
}
+ @Override
public android.view.ActionMode startActionModeForChild(View child,
android.view.ActionMode.Callback callback) {
// No starting an action mode for an action bar child! (Where would it go?)
return null;
}
+ @Override
public android.view.ActionMode startActionModeForChild(View child,
android.view.ActionMode.Callback callback, int type) {
if (type != android.view.ActionMode.TYPE_PRIMARY) {
diff --git a/v7/appcompat/src/android/support/v7/widget/ActionBarContextView.java b/v7/appcompat/src/android/support/v7/widget/ActionBarContextView.java
index 4f05080..85554d7 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActionBarContextView.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActionBarContextView.java
@@ -92,6 +92,7 @@
}
}
+ @Override
public void setContentHeight(int height) {
mContentHeight = height;
}
@@ -167,6 +168,7 @@
View closeButton = mClose.findViewById(R.id.action_mode_close_button);
closeButton.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
mode.finish();
}
diff --git a/v7/appcompat/src/android/support/v7/widget/ActionBarOverlayLayout.java b/v7/appcompat/src/android/support/v7/widget/ActionBarOverlayLayout.java
index fff6b99..1e4fd35 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActionBarOverlayLayout.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActionBarOverlayLayout.java
@@ -106,6 +106,7 @@
};
private final Runnable mRemoveActionBarHideOffset = new Runnable() {
+ @Override
public void run() {
haltActionBarHideOffsetAnimations();
mCurrentActionBarTopAnimator = mActionBarTop.animate().translationY(0)
@@ -114,6 +115,7 @@
};
private final Runnable mAddActionBarHideOffset = new Runnable() {
+ @Override
public void run() {
haltActionBarHideOffsetAnimations();
mCurrentActionBarTopAnimator = mActionBarTop.animate()
@@ -214,12 +216,14 @@
// }
}
+ @Override
protected void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
init(getContext());
ViewCompat.requestApplyInsets(this);
}
+ @Override
public void onWindowSystemUiVisibilityChanged(int visible) {
if (Build.VERSION.SDK_INT >= 16) {
super.onWindowSystemUiVisibilityChanged(visible);
diff --git a/v7/appcompat/src/android/support/v7/widget/ActionMenuPresenter.java b/v7/appcompat/src/android/support/v7/widget/ActionMenuPresenter.java
index 05f17fd..888d33b 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActionMenuPresenter.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActionMenuPresenter.java
@@ -285,6 +285,7 @@
return super.filterLeftoverView(parent, childIndex);
}
+ @Override
public boolean onSubMenuSelected(SubMenuBuilder subMenu) {
if (!subMenu.hasVisibleItems()) return false;
@@ -418,6 +419,7 @@
return mReserveOverflow;
}
+ @Override
public boolean flagActionItems() {
final ArrayList<MenuItemImpl> visibleItems;
final int itemsSize;
@@ -626,10 +628,12 @@
public static final Parcelable.Creator<SavedState> CREATOR
= new Parcelable.Creator<SavedState>() {
+ @Override
public SavedState createFromParcel(Parcel in) {
return new SavedState(in);
}
+ @Override
public SavedState[] newArray(int size) {
return new SavedState[size];
}
@@ -798,6 +802,7 @@
mPopup = popup;
}
+ @Override
public void run() {
if (mMenu != null) {
mMenu.changeMenuMode();
diff --git a/v7/appcompat/src/android/support/v7/widget/ActionMenuView.java b/v7/appcompat/src/android/support/v7/widget/ActionMenuView.java
index da56faa..517771b 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActionMenuView.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActionMenuView.java
@@ -618,18 +618,21 @@
}
/** @hide */
+ @Override
@RestrictTo(LIBRARY_GROUP)
public boolean invokeItem(MenuItemImpl item) {
return mMenu.performItemAction(item, 0);
}
/** @hide */
+ @Override
@RestrictTo(LIBRARY_GROUP)
public int getWindowAnimations() {
return 0;
}
/** @hide */
+ @Override
@RestrictTo(LIBRARY_GROUP)
public void initialize(MenuBuilder menu) {
mMenu = menu;
@@ -741,6 +744,7 @@
return result;
}
+ @Override
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
return false;
}
diff --git a/v7/appcompat/src/android/support/v7/widget/ActivityChooserModel.java b/v7/appcompat/src/android/support/v7/widget/ActivityChooserModel.java
index ad641df..2aa4cb5 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActivityChooserModel.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActivityChooserModel.java
@@ -893,6 +893,7 @@
return true;
}
+ @Override
public int compareTo(ActivityResolveInfo another) {
return Float.floatToIntBits(another.weight) - Float.floatToIntBits(weight);
}
@@ -920,6 +921,7 @@
DefaultSorter() {
}
+ @Override
public void sort(Intent intent, List<ActivityResolveInfo> activities,
List<HistoricalRecord> historicalRecords) {
Map<ComponentName, ActivityResolveInfo> componentNameToActivityMap =
diff --git a/v7/appcompat/src/android/support/v7/widget/AppCompatImageButton.java b/v7/appcompat/src/android/support/v7/widget/AppCompatImageButton.java
index f8280c9..ab2c0d1 100644
--- a/v7/appcompat/src/android/support/v7/widget/AppCompatImageButton.java
+++ b/v7/appcompat/src/android/support/v7/widget/AppCompatImageButton.java
@@ -152,6 +152,7 @@
}
}
+ @Override
public boolean hasOverlappingRendering() {
return mImageHelper.hasOverlappingRendering() && super.hasOverlappingRendering();
}
diff --git a/v7/appcompat/src/android/support/v7/widget/AppCompatImageView.java b/v7/appcompat/src/android/support/v7/widget/AppCompatImageView.java
index b749d6c..d508ebd 100644
--- a/v7/appcompat/src/android/support/v7/widget/AppCompatImageView.java
+++ b/v7/appcompat/src/android/support/v7/widget/AppCompatImageView.java
@@ -161,6 +161,7 @@
}
}
+ @Override
public boolean hasOverlappingRendering() {
return mImageHelper.hasOverlappingRendering() && super.hasOverlappingRendering();
}
diff --git a/v7/appcompat/src/android/support/v7/widget/AppCompatSpinner.java b/v7/appcompat/src/android/support/v7/widget/AppCompatSpinner.java
index 9f27f78..51e0aa4 100644
--- a/v7/appcompat/src/android/support/v7/widget/AppCompatSpinner.java
+++ b/v7/appcompat/src/android/support/v7/widget/AppCompatSpinner.java
@@ -290,6 +290,7 @@
/**
* @return the context used to inflate the Spinner's popup or dialog window
*/
+ @Override
public Context getPopupContext() {
if (mPopup != null) {
return mPopupContext;
@@ -299,6 +300,7 @@
return null;
}
+ @Override
public void setPopupBackgroundDrawable(Drawable background) {
if (mPopup != null) {
mPopup.setBackgroundDrawable(background);
@@ -307,10 +309,12 @@
}
}
+ @Override
public void setPopupBackgroundResource(@DrawableRes int resId) {
setPopupBackgroundDrawable(AppCompatResources.getDrawable(getPopupContext(), resId));
}
+ @Override
public Drawable getPopupBackground() {
if (mPopup != null) {
return mPopup.getBackground();
@@ -320,6 +324,7 @@
return null;
}
+ @Override
public void setDropDownVerticalOffset(int pixels) {
if (mPopup != null) {
mPopup.setVerticalOffset(pixels);
@@ -328,6 +333,7 @@
}
}
+ @Override
public int getDropDownVerticalOffset() {
if (mPopup != null) {
return mPopup.getVerticalOffset();
@@ -337,6 +343,7 @@
return 0;
}
+ @Override
public void setDropDownHorizontalOffset(int pixels) {
if (mPopup != null) {
mPopup.setHorizontalOffset(pixels);
@@ -351,6 +358,7 @@
*
* @return Horizontal offset in pixels
*/
+ @Override
public int getDropDownHorizontalOffset() {
if (mPopup != null) {
return mPopup.getHorizontalOffset();
@@ -360,6 +368,7 @@
return 0;
}
+ @Override
public void setDropDownWidth(int pixels) {
if (mPopup != null) {
mDropDownWidth = pixels;
@@ -368,6 +377,7 @@
}
}
+ @Override
public int getDropDownWidth() {
if (mPopup != null) {
return mDropDownWidth;
@@ -620,37 +630,45 @@
}
}
+ @Override
public int getCount() {
return mAdapter == null ? 0 : mAdapter.getCount();
}
+ @Override
public Object getItem(int position) {
return mAdapter == null ? null : mAdapter.getItem(position);
}
+ @Override
public long getItemId(int position) {
return mAdapter == null ? -1 : mAdapter.getItemId(position);
}
+ @Override
public View getView(int position, View convertView, ViewGroup parent) {
return getDropDownView(position, convertView, parent);
}
+ @Override
public View getDropDownView(int position, View convertView, ViewGroup parent) {
return (mAdapter == null) ? null
: mAdapter.getDropDownView(position, convertView, parent);
}
+ @Override
public boolean hasStableIds() {
return mAdapter != null && mAdapter.hasStableIds();
}
+ @Override
public void registerDataSetObserver(DataSetObserver observer) {
if (mAdapter != null) {
mAdapter.registerDataSetObserver(observer);
}
}
+ @Override
public void unregisterDataSetObserver(DataSetObserver observer) {
if (mAdapter != null) {
mAdapter.unregisterDataSetObserver(observer);
@@ -661,6 +679,7 @@
* If the wrapped SpinnerAdapter is also a ListAdapter, delegate this call.
* Otherwise, return true.
*/
+ @Override
public boolean areAllItemsEnabled() {
final ListAdapter adapter = mListAdapter;
if (adapter != null) {
@@ -674,6 +693,7 @@
* If the wrapped SpinnerAdapter is also a ListAdapter, delegate this call.
* Otherwise, return true.
*/
+ @Override
public boolean isEnabled(int position) {
final ListAdapter adapter = mListAdapter;
if (adapter != null) {
@@ -683,14 +703,17 @@
}
}
+ @Override
public int getItemViewType(int position) {
return 0;
}
+ @Override
public int getViewTypeCount() {
return 1;
}
+ @Override
public boolean isEmpty() {
return getCount() == 0;
}
@@ -773,6 +796,7 @@
setHorizontalOffset(hOffset);
}
+ @Override
public void show() {
final boolean wasShowing = isShowing();
diff --git a/v7/appcompat/src/android/support/v7/widget/LinearLayoutCompat.java b/v7/appcompat/src/android/support/v7/widget/LinearLayoutCompat.java
index a212c94..c7a3aee 100644
--- a/v7/appcompat/src/android/support/v7/widget/LinearLayoutCompat.java
+++ b/v7/appcompat/src/android/support/v7/widget/LinearLayoutCompat.java
@@ -1751,6 +1751,7 @@
return p instanceof LinearLayoutCompat.LayoutParams;
}
+ @Override
public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
if (Build.VERSION.SDK_INT >= 14) {
super.onInitializeAccessibilityEvent(event);
@@ -1758,6 +1759,7 @@
}
}
+ @Override
public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
if (Build.VERSION.SDK_INT >= 14) {
super.onInitializeAccessibilityNodeInfo(info);
diff --git a/v7/appcompat/src/android/support/v7/widget/Toolbar.java b/v7/appcompat/src/android/support/v7/widget/Toolbar.java
index 277c1cb..1865df1 100644
--- a/v7/appcompat/src/android/support/v7/widget/Toolbar.java
+++ b/v7/appcompat/src/android/support/v7/widget/Toolbar.java
@@ -476,6 +476,7 @@
requestLayout();
}
+ @Override
public void onRtlPropertiesChanged(int layoutDirection) {
if (Build.VERSION.SDK_INT >= 17) {
super.onRtlPropertiesChanged(layoutDirection);
diff --git a/v7/appcompat/tests/src/android/support/v7/custom/CustomDrawerLayout.java b/v7/appcompat/tests/src/android/support/v7/custom/CustomDrawerLayout.java
index 217ccbc..dc202cd 100644
--- a/v7/appcompat/tests/src/android/support/v7/custom/CustomDrawerLayout.java
+++ b/v7/appcompat/tests/src/android/support/v7/custom/CustomDrawerLayout.java
@@ -38,6 +38,7 @@
super(context, attrs, defStyle);
}
+ @Override
public WindowInsets dispatchApplyWindowInsets(WindowInsets insets) {
mSystemWindowInsetTop = insets.getSystemWindowInsetTop();
return super.dispatchApplyWindowInsets(insets);
diff --git a/v7/cardview/src/android/support/v7/widget/CardView.java b/v7/cardview/src/android/support/v7/widget/CardView.java
index 3b47a54..17a9cc4 100644
--- a/v7/cardview/src/android/support/v7/widget/CardView.java
+++ b/v7/cardview/src/android/support/v7/widget/CardView.java
@@ -126,6 +126,7 @@
// NO OP
}
+ @Override
public void setPaddingRelative(int start, int top, int end, int bottom) {
// NO OP
}
diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java b/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java
index 5b9d556..6cc8c5d 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java
@@ -342,7 +342,7 @@
return super.verifyDrawable(who) || who == mRemoteIndicator;
}
- //@Override defined in v11
+ @Override
public void jumpDrawablesToCurrentState() {
// We can't call super to handle the background so we do it ourselves.
//super.jumpDrawablesToCurrentState();
diff --git a/v7/preference/src/android/support/v7/internal/widget/PreferenceImageView.java b/v7/preference/src/android/support/v7/internal/widget/PreferenceImageView.java
index e2a133cd..e9a9dcf 100644
--- a/v7/preference/src/android/support/v7/internal/widget/PreferenceImageView.java
+++ b/v7/preference/src/android/support/v7/internal/widget/PreferenceImageView.java
@@ -69,6 +69,7 @@
super.setMaxWidth(maxWidth);
}
+ @Override
public int getMaxWidth() {
return mMaxWidth;
}
@@ -79,6 +80,7 @@
super.setMaxHeight(maxHeight);
}
+ @Override
public int getMaxHeight() {
return mMaxHeight;
}
diff --git a/v7/preference/src/android/support/v7/preference/MultiSelectListPreferenceDialogFragmentCompat.java b/v7/preference/src/android/support/v7/preference/MultiSelectListPreferenceDialogFragmentCompat.java
index 370c960..791c299 100644
--- a/v7/preference/src/android/support/v7/preference/MultiSelectListPreferenceDialogFragmentCompat.java
+++ b/v7/preference/src/android/support/v7/preference/MultiSelectListPreferenceDialogFragmentCompat.java
@@ -102,6 +102,7 @@
}
builder.setMultiChoiceItems(mEntries, checkedItems,
new DialogInterface.OnMultiChoiceClickListener() {
+ @Override
public void onClick(DialogInterface dialog, int which, boolean isChecked) {
if (isChecked) {
mPreferenceChanged |= mNewValues.add(
diff --git a/v7/preference/src/android/support/v7/preference/SeekBarPreference.java b/v7/preference/src/android/support/v7/preference/SeekBarPreference.java
index 7e843d8..963604c 100644
--- a/v7/preference/src/android/support/v7/preference/SeekBarPreference.java
+++ b/v7/preference/src/android/support/v7/preference/SeekBarPreference.java
@@ -362,10 +362,12 @@
@SuppressWarnings("unused")
public static final Parcelable.Creator<SavedState> CREATOR =
new Parcelable.Creator<SavedState>() {
+ @Override
public SavedState createFromParcel(Parcel in) {
return new SavedState(in);
}
+ @Override
public SavedState[] newArray(int size) {
return new SavedState[size];
}
diff --git a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
index 4f51f0e..511af9d 100644
--- a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
+++ b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
@@ -2583,7 +2583,7 @@
/**
* Returns true if RecyclerView is attached to window.
*/
- // @override
+ @Override
public boolean isAttachedToWindow() {
return mIsAttached;
}
@@ -2991,7 +2991,7 @@
}
}
- // @Override
+ @Override
public boolean onGenericMotionEvent(MotionEvent event) {
if (mLayout == null) {
return false;
diff --git a/v7/recyclerview/tests/src/android/support/v7/util/AsyncListUtilTest.java b/v7/recyclerview/tests/src/android/support/v7/util/AsyncListUtilTest.java
index 8766f8c..f8d27ed 100644
--- a/v7/recyclerview/tests/src/android/support/v7/util/AsyncListUtilTest.java
+++ b/v7/recyclerview/tests/src/android/support/v7/util/AsyncListUtilTest.java
@@ -210,6 +210,7 @@
return mDataItemCount;
}
+ @Override
public int getMaxCachedTiles() {
return mCacheSize;
}
diff --git a/v7/recyclerview/tests/src/android/support/v7/widget/DefaultItemAnimatorTest.java b/v7/recyclerview/tests/src/android/support/v7/widget/DefaultItemAnimatorTest.java
index 4e3cc6b..c28623f 100644
--- a/v7/recyclerview/tests/src/android/support/v7/widget/DefaultItemAnimatorTest.java
+++ b/v7/recyclerview/tests/src/android/support/v7/widget/DefaultItemAnimatorTest.java
@@ -111,6 +111,7 @@
mDummyParent = getActivity().getContainer();
}
+ @Override
void checkForMainThreadException() throws Throwable {
if (mainThreadException != null) {
throw mainThreadException;
@@ -385,6 +386,7 @@
return vh;
}
+ @Override
void postExceptionToInstrumentation(Throwable t) {
if (mainThreadException == null) {
mainThreadException = t;
diff --git a/v7/recyclerview/tests/src/android/support/v7/widget/DefaultMeasureSpecTest.java b/v7/recyclerview/tests/src/android/support/v7/widget/DefaultMeasureSpecTest.java
index 08da3fb7..c756ca0 100644
--- a/v7/recyclerview/tests/src/android/support/v7/widget/DefaultMeasureSpecTest.java
+++ b/v7/recyclerview/tests/src/android/support/v7/widget/DefaultMeasureSpecTest.java
@@ -152,6 +152,7 @@
runTest();
}
+ @Override
@Test
public void runTest() {
mRecyclerView.defaultOnMeasure(mWSpec, mHSpec);
diff --git a/v7/recyclerview/tests/src/android/support/v7/widget/RecyclerViewAccessibilityTest.java b/v7/recyclerview/tests/src/android/support/v7/widget/RecyclerViewAccessibilityTest.java
index e952370..2a6ca93 100644
--- a/v7/recyclerview/tests/src/android/support/v7/widget/RecyclerViewAccessibilityTest.java
+++ b/v7/recyclerview/tests/src/android/support/v7/widget/RecyclerViewAccessibilityTest.java
@@ -75,13 +75,13 @@
@Test
public void onInitializeAccessibilityNodeInfoTest() throws Throwable {
final RecyclerView recyclerView = new RecyclerView(getActivity()) {
- //@Override
+ @Override
public boolean canScrollHorizontally(int direction) {
return direction < 0 && mHorizontalScrollBefore ||
direction > 0 && mHorizontalScrollAfter;
}
- //@Override
+ @Override
public boolean canScrollVertically(int direction) {
return direction < 0 && mVerticalScrollBefore ||
direction > 0 && mVerticalScrollAfter;
@@ -240,11 +240,13 @@
public void ignoreAccessibilityIfAdapterHasChanged() throws Throwable {
final RecyclerView recyclerView = new RecyclerView(getActivity()) {
//@Override
+ @Override
public boolean canScrollHorizontally(int direction) {
return true;
}
//@Override
+ @Override
public boolean canScrollVertically(int direction) {
return true;
}
diff --git a/v7/recyclerview/tests/src/android/support/v7/widget/StaggeredGridLayoutManagerSavedStateTest.java b/v7/recyclerview/tests/src/android/support/v7/widget/StaggeredGridLayoutManagerSavedStateTest.java
index 4757a54..50bdf1b 100644
--- a/v7/recyclerview/tests/src/android/support/v7/widget/StaggeredGridLayoutManagerSavedStateTest.java
+++ b/v7/recyclerview/tests/src/android/support/v7/widget/StaggeredGridLayoutManagerSavedStateTest.java
@@ -153,6 +153,7 @@
void onBoundItem(TestViewHolder vh, int position) {
}
+ @Override
boolean assignRandomSize() {
return false;
}