Merge "A pass at fixing unchecked javac warnings."
diff --git a/compat/api21/android/support/v4/app/ActivityOptionsCompat21.java b/compat/api21/android/support/v4/app/ActivityOptionsCompat21.java
index 8f2b2e8..0b04ba8 100644
--- a/compat/api21/android/support/v4/app/ActivityOptionsCompat21.java
+++ b/compat/api21/android/support/v4/app/ActivityOptionsCompat21.java
@@ -55,9 +55,10 @@
sharedElementName));
}
+ @SuppressWarnings("unchecked")
public static ActivityOptionsCompat21 makeSceneTransitionAnimation(Activity activity,
View[] sharedElements, String[] sharedElementNames) {
- Pair[] pairs = null;
+ Pair<View, String>[] pairs = null;
if (sharedElements != null) {
pairs = new Pair[sharedElements.length];
for (int i = 0; i < pairs.length; i++) {
diff --git a/compat/api23/android/support/v4/app/ActivityOptionsCompat23.java b/compat/api23/android/support/v4/app/ActivityOptionsCompat23.java
index 08863a5..a5daaa7 100644
--- a/compat/api23/android/support/v4/app/ActivityOptionsCompat23.java
+++ b/compat/api23/android/support/v4/app/ActivityOptionsCompat23.java
@@ -56,9 +56,10 @@
sharedElementName));
}
+ @SuppressWarnings("unchecked")
public static ActivityOptionsCompat23 makeSceneTransitionAnimation(Activity activity,
View[] sharedElements, String[] sharedElementNames) {
- Pair[] pairs = null;
+ Pair<View, String>[] pairs = null;
if (sharedElements != null) {
pairs = new Pair[sharedElements.length];
for (int i = 0; i < pairs.length; i++) {
diff --git a/compat/api24/android/support/v4/app/ActivityOptionsCompat24.java b/compat/api24/android/support/v4/app/ActivityOptionsCompat24.java
index 8e0d520..608c017 100644
--- a/compat/api24/android/support/v4/app/ActivityOptionsCompat24.java
+++ b/compat/api24/android/support/v4/app/ActivityOptionsCompat24.java
@@ -56,9 +56,10 @@
sharedElementName));
}
+ @SuppressWarnings("unchecked")
public static ActivityOptionsCompat24 makeSceneTransitionAnimation(Activity activity,
View[] sharedElements, String[] sharedElementNames) {
- Pair[] pairs = null;
+ Pair<View, String>[] pairs = null;
if (sharedElements != null) {
pairs = new Pair[sharedElements.length];
for (int i = 0; i < pairs.length; i++) {
diff --git a/compat/ics/android/support/v4/graphics/PaintCompatApi14.java b/compat/ics/android/support/v4/graphics/PaintCompatApi14.java
index b459623..86e87d8 100644
--- a/compat/ics/android/support/v4/graphics/PaintCompatApi14.java
+++ b/compat/ics/android/support/v4/graphics/PaintCompatApi14.java
@@ -88,7 +88,7 @@
private static Pair<Rect, Rect> obtainEmptyRects() {
Pair<Rect, Rect> rects = sRectThreadLocal.get();
if (rects == null) {
- rects = new Pair(new Rect(), new Rect());
+ rects = new Pair<>(new Rect(), new Rect());
sRectThreadLocal.set(rects);
} else {
rects.first.setEmpty();
diff --git a/compat/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java b/compat/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java
index 632eae9..6bd1031 100644
--- a/compat/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java
+++ b/compat/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java
@@ -1439,6 +1439,7 @@
return new AccessibilityNodeInfo.AccessibilityAction(actionId, label);
}
+ @SuppressWarnings("unchecked")
@Override
public List<Object> getActionList(AccessibilityNodeInfo info) {
Object result = info.getActionList();
diff --git a/core-ui/tests/java/android/support/v4/view/BaseViewPagerTest.java b/core-ui/tests/java/android/support/v4/view/BaseViewPagerTest.java
index dfa7a22..a83a976 100644
--- a/core-ui/tests/java/android/support/v4/view/BaseViewPagerTest.java
+++ b/core-ui/tests/java/android/support/v4/view/BaseViewPagerTest.java
@@ -97,7 +97,7 @@
protected ArrayList<Pair<String, Q>> mEntries = new ArrayList<>();
public void add(String title, Q content) {
- mEntries.add(new Pair(title, content));
+ mEntries.add(new Pair<>(title, content));
}
@Override
diff --git a/design/src/android/support/design/widget/DirectedAcyclicGraph.java b/design/src/android/support/design/widget/DirectedAcyclicGraph.java
index 189daf4..85a32cd 100644
--- a/design/src/android/support/design/widget/DirectedAcyclicGraph.java
+++ b/design/src/android/support/design/widget/DirectedAcyclicGraph.java
@@ -97,7 +97,7 @@
* @return a list containing any outgoing edges, or null if there are none.
*/
@Nullable
- List getOutgoingEdges(@NonNull T node) {
+ List<T> getOutgoingEdges(@NonNull T node) {
ArrayList<T> result = null;
for (int i = 0, size = mGraph.size(); i < size; i++) {
ArrayList<T> edges = mGraph.valueAt(i);
diff --git a/design/tests/src/android/support/design/widget/TabLayoutWithViewPagerTest.java b/design/tests/src/android/support/design/widget/TabLayoutWithViewPagerTest.java
index c01b785..09bf43c 100755
--- a/design/tests/src/android/support/design/widget/TabLayoutWithViewPagerTest.java
+++ b/design/tests/src/android/support/design/widget/TabLayoutWithViewPagerTest.java
@@ -72,7 +72,7 @@
protected ArrayList<Pair<String, Q>> mEntries = new ArrayList<>();
public void add(String title, Q content) {
- mEntries.add(new Pair(title, content));
+ mEntries.add(new Pair<>(title, content));
}
@Override
diff --git a/exifinterface/src/android/support/media/ExifInterface.java b/exifinterface/src/android/support/media/ExifInterface.java
index c4d602d..5a8ae3e 100644
--- a/exifinterface/src/android/support/media/ExifInterface.java
+++ b/exifinterface/src/android/support/media/ExifInterface.java
@@ -50,7 +50,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -1185,14 +1184,19 @@
new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, 514, IFD_FORMAT_ULONG);
// Mappings from tag number to tag name and each item represents one IFD tag group.
- private static final HashMap[] sExifTagMapsForReading = new HashMap[EXIF_TAGS.length];
+ @SuppressWarnings("unchecked")
+ private static final HashMap<Integer, ExifTag>[] sExifTagMapsForReading =
+ new HashMap[EXIF_TAGS.length];
// Mappings from tag name to tag number and each item represents one IFD tag group.
- private static final HashMap[] sExifTagMapsForWriting = new HashMap[EXIF_TAGS.length];
+ @SuppressWarnings("unchecked")
+ private static final HashMap<String, ExifTag>[] sExifTagMapsForWriting =
+ new HashMap[EXIF_TAGS.length];
private static final HashSet<String> sTagSetForCompatibility = new HashSet<>(Arrays.asList(
TAG_F_NUMBER, TAG_DIGITAL_ZOOM_RATIO, TAG_EXPOSURE_TIME, TAG_SUBJECT_DISTANCE,
TAG_GPS_TIMESTAMP));
// Mappings from tag number to IFD type for pointer tags.
- private static final HashMap sExifPointerTagMap = new HashMap();
+ @SuppressWarnings("unchecked")
+ private static final HashMap<Integer, Integer> sExifPointerTagMap = new HashMap();
// See JPEG File Interchange Format Version 1.02.
// The following values are defined for handling JPEG streams. In this implementation, we are
@@ -1245,8 +1249,8 @@
// Build up the hash tables to look up Exif tags for reading Exif tags.
for (int ifdType = 0; ifdType < EXIF_TAGS.length; ++ifdType) {
- sExifTagMapsForReading[ifdType] = new HashMap();
- sExifTagMapsForWriting[ifdType] = new HashMap();
+ sExifTagMapsForReading[ifdType] = new HashMap<>();
+ sExifTagMapsForWriting[ifdType] = new HashMap<>();
for (ExifTag tag : EXIF_TAGS[ifdType]) {
sExifTagMapsForReading[ifdType].put(tag.number, tag);
sExifTagMapsForWriting[ifdType].put(tag.name, tag);
@@ -1265,7 +1269,8 @@
private final String mFilename;
private final AssetManager.AssetInputStream mAssetInputStream;
private int mMimeType;
- private final HashMap[] mAttributes = new HashMap[EXIF_TAGS.length];
+ @SuppressWarnings("unchecked")
+ private final HashMap<String, ExifAttribute>[] mAttributes = new HashMap[EXIF_TAGS.length];
private ByteOrder mExifByteOrder = ByteOrder.BIG_ENDIAN;
private boolean mHasThumbnail;
// The following values used for indicating a thumbnail position.
@@ -1333,9 +1338,9 @@
// Retrieves all tag groups. The value from primary image tag group has a higher priority
// than the value from the thumbnail tag group if there are more than one candidates.
for (int i = 0; i < EXIF_TAGS.length; ++i) {
- Object value = mAttributes[i].get(tag);
+ ExifAttribute value = mAttributes[i].get(tag);
if (value != null) {
- return (ExifAttribute) value;
+ return value;
}
}
return null;
@@ -1453,13 +1458,12 @@
if (i == IFD_TYPE_THUMBNAIL && !mHasThumbnail) {
continue;
}
- final Object obj = sExifTagMapsForWriting[i].get(tag);
- if (obj != null) {
+ final ExifTag exifTag = sExifTagMapsForWriting[i].get(tag);
+ if (exifTag != null) {
if (value == null) {
mAttributes[i].remove(tag);
continue;
}
- final ExifTag exifTag = (ExifTag) obj;
Pair<Integer, Integer> guess = guessDataFormat(value);
int dataFormat;
if (exifTag.primaryFormat == guess.first || exifTag.primaryFormat == guess.second) {
@@ -1600,7 +1604,7 @@
try {
// Initialize mAttributes.
for (int i = 0; i < EXIF_TAGS.length; ++i) {
- mAttributes[i] = new HashMap();
+ mAttributes[i] = new HashMap<>();
}
// Check file type
@@ -1667,8 +1671,8 @@
private void printAttributes() {
for (int i = 0; i < mAttributes.length; ++i) {
Log.d(TAG, "The size of tag group[" + i + "]: " + mAttributes[i].size());
- for (Map.Entry entry : (Set<Map.Entry>) mAttributes[i].entrySet()) {
- final ExifAttribute tagValue = (ExifAttribute) entry.getValue();
+ for (Map.Entry<String, ExifAttribute> entry : mAttributes[i].entrySet()) {
+ final ExifAttribute tagValue = entry.getValue();
Log.d(TAG, "tagName: " + entry.getKey() + ", tagType: " + tagValue.toString()
+ ", tagValue: '" + tagValue.getStringValue(mExifByteOrder) + "'");
}
@@ -2772,7 +2776,7 @@
}
// Recursively parse IFD when a IFD pointer tag appears.
- Object nextIfdType = sExifPointerTagMap.get(tagNumber);
+ Integer nextIfdType = sExifPointerTagMap.get(tagNumber);
if (DEBUG) {
Log.d(TAG, "nextIfdType: " + nextIfdType + " byteCount: " + byteCount);
}
@@ -2808,7 +2812,7 @@
}
if (offset > 0L && offset < dataInputStream.mLength) {
dataInputStream.seek(offset);
- readImageFileDirectory(dataInputStream, (int) nextIfdType);
+ readImageFileDirectory(dataInputStream, nextIfdType);
} else {
Log.w(TAG, "Skip jump into the IFD since its offset is invalid: " + offset);
}
@@ -3098,7 +3102,7 @@
if (mAttributes[IFD_TYPE_THUMBNAIL].isEmpty()) {
if (isThumbnail(mAttributes[IFD_TYPE_PREVIEW])) {
mAttributes[IFD_TYPE_THUMBNAIL] = mAttributes[IFD_TYPE_PREVIEW];
- mAttributes[IFD_TYPE_PREVIEW] = new HashMap();
+ mAttributes[IFD_TYPE_PREVIEW] = new HashMap<>();
}
}
@@ -3235,8 +3239,8 @@
// value which has a bigger size than 4 bytes.
for (int i = 0; i < EXIF_TAGS.length; ++i) {
int sum = 0;
- for (Map.Entry entry : (Set<Map.Entry>) mAttributes[i].entrySet()) {
- final ExifAttribute exifAttribute = (ExifAttribute) entry.getValue();
+ for (Map.Entry<String, ExifAttribute> entry : mAttributes[i].entrySet()) {
+ final ExifAttribute exifAttribute = entry.getValue();
final int size = exifAttribute.size();
if (size > 4) {
sum += size;
@@ -3303,12 +3307,11 @@
// Write entry info
int dataOffset = ifdOffsets[ifdType] + 2 + mAttributes[ifdType].size() * 12 + 4;
- for (Map.Entry entry : (Set<Map.Entry>) mAttributes[ifdType].entrySet()) {
+ for (Map.Entry<String, ExifAttribute> entry : mAttributes[ifdType].entrySet()) {
// Convert tag name to tag number.
- final ExifTag tag =
- (ExifTag) sExifTagMapsForWriting[ifdType].get(entry.getKey());
+ final ExifTag tag = sExifTagMapsForWriting[ifdType].get(entry.getKey());
final int tagNumber = tag.number;
- final ExifAttribute attribute = (ExifAttribute) entry.getValue();
+ final ExifAttribute attribute = entry.getValue();
final int size = attribute.size();
dataOutputStream.writeUnsignedShort(tagNumber);
@@ -3338,8 +3341,8 @@
}
// Write values of data field exceeding 4 bytes after the next offset.
- for (Map.Entry entry : (Set<Map.Entry>) mAttributes[ifdType].entrySet()) {
- ExifAttribute attribute = (ExifAttribute) entry.getValue();
+ for (Map.Entry<String, ExifAttribute> entry : mAttributes[ifdType].entrySet()) {
+ ExifAttribute attribute = entry.getValue();
if (attribute.bytes.length > 4) {
dataOutputStream.write(attribute.bytes, 0, attribute.bytes.length);
@@ -3775,7 +3778,7 @@
if (firstImageLengthValue < secondImageLengthValue &&
firstImageWidthValue < secondImageWidthValue) {
- HashMap tempMap = mAttributes[firstIfdType];
+ HashMap<String, ExifAttribute> tempMap = mAttributes[firstIfdType];
mAttributes[firstIfdType] = mAttributes[secondIfdType];
mAttributes[secondIfdType] = tempMap;
}
diff --git a/fragment/java/android/support/v4/app/FragmentManager.java b/fragment/java/android/support/v4/app/FragmentManager.java
index 0d311c0..8302203 100644
--- a/fragment/java/android/support/v4/app/FragmentManager.java
+++ b/fragment/java/android/support/v4/app/FragmentManager.java
@@ -3160,7 +3160,7 @@
if (mLifecycleCallbacks == null) {
mLifecycleCallbacks = new CopyOnWriteArrayList<>();
}
- mLifecycleCallbacks.add(new Pair(cb, recursive));
+ mLifecycleCallbacks.add(new Pair<>(cb, recursive));
}
@Override
diff --git a/media-compat/java/android/support/v4/media/MediaBrowserCompat.java b/media-compat/java/android/support/v4/media/MediaBrowserCompat.java
index 17a9391..48a945e 100644
--- a/media-compat/java/android/support/v4/media/MediaBrowserCompat.java
+++ b/media-compat/java/android/support/v4/media/MediaBrowserCompat.java
@@ -673,7 +673,7 @@
}
private void setSubscription(Subscription subscription) {
- mSubscriptionRef = new WeakReference(subscription);
+ mSubscriptionRef = new WeakReference<>(subscription);
}
private class StubApi21 implements MediaBrowserCompatApi21.SubscriptionCallback {
@@ -1846,8 +1846,8 @@
private final List<Bundle> mOptionsList;
public Subscription() {
- mCallbacks = new ArrayList();
- mOptionsList = new ArrayList();
+ mCallbacks = new ArrayList<>();
+ mOptionsList = new ArrayList<>();
}
public boolean isEmpty() {
diff --git a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
index f4cd516..7fbf88e 100644
--- a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
+++ b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
@@ -540,7 +540,7 @@
Bundle rootHints;
ServiceCallbacks callbacks;
BrowserRoot root;
- HashMap<String, List<Pair<IBinder, Bundle>>> subscriptions = new HashMap();
+ HashMap<String, List<Pair<IBinder, Bundle>>> subscriptions = new HashMap<>();
ConnectionRecord() {
}
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/view/ViewPagerActivity.java b/samples/Support4Demos/src/com/example/android/supportv4/view/ViewPagerActivity.java
index 5150363..487e8db 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/view/ViewPagerActivity.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/view/ViewPagerActivity.java
@@ -16,8 +16,6 @@
package com.example.android.supportv4.view;
-import com.example.android.supportv4.R;
-
import android.app.Activity;
import android.graphics.Color;
import android.os.Bundle;
@@ -28,6 +26,8 @@
import android.view.View;
import android.view.ViewGroup;
+import com.example.android.supportv4.R;
+
import java.util.ArrayList;
public class ViewPagerActivity extends Activity {
@@ -56,7 +56,7 @@
private ArrayList<Pair<String, Integer>> mEntries = new ArrayList<>();
public void add(String title, int color) {
- mEntries.add(new Pair(title, color));
+ mEntries.add(new Pair<>(title, color));
}
@Override
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 70216f5..a538408 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/widget/StableIdActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/StableIdActivity.java
@@ -117,7 +117,7 @@
final int pos = viewHolder.getAdapterPosition();
if (pos != RecyclerView.NO_POSITION) {
// swap item to top, and notify data set changed
- Pair d = mData.remove(pos);
+ Pair<Integer, String> d = mData.remove(pos);
mData.add(0, d);
notifyDataSetChanged();
diff --git a/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java b/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java
index 901bf06..6b394e6 100644
--- a/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java
+++ b/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java
@@ -267,6 +267,7 @@
return result;
}
+ @SuppressWarnings("unchecked")
@Override
protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
setValues(restoreValue ? getPersistedStringSet(mValues) : (Set<String>) defaultValue);
diff --git a/v17/leanback/src/android/support/v17/leanback/app/BrowseFragment.java b/v17/leanback/src/android/support/v17/leanback/app/BrowseFragment.java
index 1c9e5ca..ed20153 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/BrowseFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/BrowseFragment.java
@@ -578,7 +578,7 @@
* against {@link PageRow}.
*/
public final static class MainFragmentAdapterRegistry {
- private final Map<Class, FragmentFactory> mItemToFragmentFactoryMapping = new HashMap();
+ private final Map<Class, FragmentFactory> mItemToFragmentFactoryMapping = new HashMap<>();
private final static FragmentFactory sDefaultFragmentFactory = new ListRowFragmentFactory();
public MainFragmentAdapterRegistry() {
diff --git a/v17/leanback/src/android/support/v17/leanback/app/BrowseSupportFragment.java b/v17/leanback/src/android/support/v17/leanback/app/BrowseSupportFragment.java
index c7d8de4..43e10b2 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/BrowseSupportFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/BrowseSupportFragment.java
@@ -581,7 +581,7 @@
* against {@link PageRow}.
*/
public final static class MainFragmentAdapterRegistry {
- private final Map<Class, FragmentFactory> mItemToFragmentFactoryMapping = new HashMap();
+ private final Map<Class, FragmentFactory> mItemToFragmentFactoryMapping = new HashMap<>();
private final static FragmentFactory sDefaultFragmentFactory = new ListRowFragmentFactory();
public MainFragmentAdapterRegistry() {
diff --git a/v17/leanback/src/android/support/v17/leanback/app/DetailsFragment.java b/v17/leanback/src/android/support/v17/leanback/app/DetailsFragment.java
index 9438ce5..00a1ace 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/DetailsFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/DetailsFragment.java
@@ -126,7 +126,7 @@
final WeakReference<DetailsFragment> mRef;
WaitEnterTransitionTimeout(DetailsFragment f) {
- mRef = new WeakReference(f);
+ mRef = new WeakReference<>(f);
f.getView().postDelayed(this, WAIT_ENTERTRANSITION_START);
}
diff --git a/v17/leanback/src/android/support/v17/leanback/app/DetailsSupportFragment.java b/v17/leanback/src/android/support/v17/leanback/app/DetailsSupportFragment.java
index 79ab727..eb78840 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/DetailsSupportFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/DetailsSupportFragment.java
@@ -129,7 +129,7 @@
final WeakReference<DetailsSupportFragment> mRef;
WaitEnterTransitionTimeout(DetailsSupportFragment f) {
- mRef = new WeakReference(f);
+ mRef = new WeakReference<>(f);
f.getView().postDelayed(this, WAIT_ENTERTRANSITION_START);
}
diff --git a/v17/leanback/src/android/support/v17/leanback/widget/Action.java b/v17/leanback/src/android/support/v17/leanback/widget/Action.java
index 628edda..715fdd9 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/Action.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/Action.java
@@ -31,7 +31,7 @@
private Drawable mIcon;
private CharSequence mLabel1;
private CharSequence mLabel2;
- private ArrayList mKeyCodes = new ArrayList();
+ private ArrayList<Integer> mKeyCodes = new ArrayList<>();
/**
* Constructor for an Action.
diff --git a/v17/leanback/tests/java/android/support/v17/leanback/app/TestActivity.java b/v17/leanback/tests/java/android/support/v17/leanback/app/TestActivity.java
index 7f9b408..9aa872c 100644
--- a/v17/leanback/tests/java/android/support/v17/leanback/app/TestActivity.java
+++ b/v17/leanback/tests/java/android/support/v17/leanback/app/TestActivity.java
@@ -83,7 +83,7 @@
public static final String EXTRA_PROVIDER = "testActivityProvider";
- static HashMap<String, Provider> sProviders = new HashMap();
+ static HashMap<String, Provider> sProviders = new HashMap<>();
String mProviderName;
Provider mProvider;
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 1e314e4..ff87b93 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
@@ -224,7 +224,7 @@
*/
protected View[][] sortByRows() {
final HashMap<Integer, ArrayList<View>> rows = new HashMap<Integer, ArrayList<View>>();
- ArrayList<Integer> rowLocations = new ArrayList();
+ ArrayList<Integer> rowLocations = new ArrayList<>();
for (int i = 0; i < mGridView.getChildCount(); i++) {
View v = mGridView.getChildAt(i);
int rowLocation;
@@ -2890,7 +2890,7 @@
mNumRows = 1;
assertEquals(mGridView.getSelectedPosition(), 0);
- final SparseArray states = new SparseArray();
+ final SparseArray<Parcelable> states = new SparseArray<>();
mActivityTestRule.runOnUiThread(new Runnable() {
@Override
public void run() {
diff --git a/v7/mediarouter/src/android/support/v7/media/MediaRouter.java b/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
index fe16de8..1a17ef5 100644
--- a/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
+++ b/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
@@ -2289,7 +2289,7 @@
mRoutes.add(route);
// 2. Create the route's contents.
if (isGroup) {
- addedGroups.add(new Pair(route, routeDescriptor));
+ addedGroups.add(new Pair<>(route, routeDescriptor));
} else {
route.maybeUpdateDescriptor(routeDescriptor);
// 3. Notify clients about addition.
@@ -2309,7 +2309,7 @@
sourceIndex, targetIndex++);
// 2. Update the route's contents.
if (route instanceof RouteGroup) {
- updatedGroups.add(new Pair(route, routeDescriptor));
+ updatedGroups.add(new Pair<>(route, routeDescriptor));
} else {
// 3. Notify clients about changes.
if (updateRouteDescriptorAndNotify(route, routeDescriptor)
@@ -2413,7 +2413,7 @@
String componentName = provider.getComponentName().flattenToShortString();
String uniqueId = componentName + ":" + routeDescriptorId;
if (findRouteByUniqueId(uniqueId) < 0) {
- mUniqueIdMap.put(new Pair(componentName, routeDescriptorId), uniqueId);
+ mUniqueIdMap.put(new Pair<>(componentName, routeDescriptorId), uniqueId);
return uniqueId;
}
Log.w(TAG, "Either " + routeDescriptorId + " isn't unique in " + componentName
@@ -2421,7 +2421,7 @@
for (int i = 2; ; i++) {
String newUniqueId = String.format(Locale.US, "%s_%d", uniqueId, i);
if (findRouteByUniqueId(newUniqueId) < 0) {
- mUniqueIdMap.put(new Pair(componentName, routeDescriptorId), newUniqueId);
+ mUniqueIdMap.put(new Pair<>(componentName, routeDescriptorId), newUniqueId);
return newUniqueId;
}
}
@@ -2439,7 +2439,7 @@
private String getUniqueId(ProviderInfo provider, String routeDescriptorId) {
String componentName = provider.getComponentName().flattenToShortString();
- return mUniqueIdMap.get(new Pair(componentName, routeDescriptorId));
+ return mUniqueIdMap.get(new Pair<>(componentName, routeDescriptorId));
}
private void updateSelectedRouteIfNeeded(boolean selectedRouteDescriptorChanged) {
@@ -2494,7 +2494,7 @@
if (mSelectedRoute instanceof RouteGroup) {
List<RouteInfo> routes = ((RouteGroup) mSelectedRoute).getRoutes();
// Build a set of descriptor IDs for the new route group.
- Set idSet = new HashSet<String>();
+ Set<String> idSet = new HashSet<>();
for (RouteInfo route : routes) {
idSet.add(route.mDescriptorId);
}
diff --git a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
index 511af9d..37b39e3 100644
--- a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
+++ b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
@@ -487,7 +487,7 @@
* the View's state is undefined.
*/
@VisibleForTesting
- final List<ViewHolder> mPendingAccessibilityImportanceChange = new ArrayList();
+ final List<ViewHolder> mPendingAccessibilityImportanceChange = new ArrayList<>();
private Runnable mItemAnimatorRunner = new Runnable() {
@Override
@@ -5105,7 +5105,7 @@
public void putRecycledView(ViewHolder scrap) {
final int viewType = scrap.getItemViewType();
- final ArrayList scrapHeap = getScrapDataForType(viewType).mScrapHeap;
+ final ArrayList<ViewHolder> scrapHeap = getScrapDataForType(viewType).mScrapHeap;
if (mScrap.get(viewType).mMaxScrap <= scrapHeap.size()) {
return;
}
diff --git a/wearable/tests/src/android/support/wearable/view/BoxInsetLayoutTest.java b/wearable/tests/src/android/support/wearable/view/BoxInsetLayoutTest.java
index 98fa0f0..16d92d11 100644
--- a/wearable/tests/src/android/support/wearable/view/BoxInsetLayoutTest.java
+++ b/wearable/tests/src/android/support/wearable/view/BoxInsetLayoutTest.java
@@ -359,6 +359,6 @@
}
private abstract class ViewFetchingRunnable implements Runnable {
- Map<Integer, View> mIdViewMap = new HashMap();
+ Map<Integer, View> mIdViewMap = new HashMap<>();
}
}