Skip to content

Commit f00b418

Browse files
author
amatellanes
committed
Remove prefixes using static import
1 parent 3be3191 commit f00b418

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

picasso/src/main/java/com/squareup/picasso/ContactsPhotoBitmapHunter.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
import android.graphics.Bitmap;
2222
import android.graphics.BitmapFactory;
2323
import android.net.Uri;
24-
import android.os.Build;
2524
import android.provider.ContactsContract;
25+
2626
import java.io.IOException;
2727
import java.io.InputStream;
2828

29+
import static android.os.Build.VERSION.SDK_INT;
30+
import static android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH;
2931
import static android.provider.ContactsContract.Contacts.openContactPhotoInputStream;
3032
import static com.squareup.picasso.Picasso.LoadedFrom.DISK;
3133

@@ -62,7 +64,7 @@ private InputStream getInputStream() throws IOException {
6264
return null;
6365
}
6466
}
65-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
67+
if (SDK_INT < ICE_CREAM_SANDWICH) {
6668
return openContactPhotoInputStream(contentResolver, uri);
6769
} else {
6870
return ContactPhotoStreamIcs.get(contentResolver, uri);
@@ -88,7 +90,7 @@ private Bitmap decodeStream(InputStream stream, Request data) throws IOException
8890
return BitmapFactory.decodeStream(stream, null, options);
8991
}
9092

91-
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
93+
@TargetApi(ICE_CREAM_SANDWICH)
9294
private static class ContactPhotoStreamIcs {
9395
static InputStream get(ContentResolver contentResolver, Uri uri) {
9496
return openContactPhotoInputStream(contentResolver, uri, true);

picasso/src/main/java/com/squareup/picasso/Utils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import android.content.Context;
2222
import android.content.pm.PackageManager;
2323
import android.graphics.Bitmap;
24-
import android.os.Build;
2524
import android.os.Looper;
2625
import android.os.Process;
2726
import android.os.StatFs;
@@ -36,6 +35,7 @@
3635
import static android.content.Context.ACTIVITY_SERVICE;
3736
import static android.content.pm.ApplicationInfo.FLAG_LARGE_HEAP;
3837
import static android.os.Build.VERSION.SDK_INT;
38+
import static android.os.Build.VERSION_CODES.HONEYCOMB;
3939
import static android.os.Build.VERSION_CODES.HONEYCOMB_MR1;
4040
import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
4141
import static android.provider.Settings.System.AIRPLANE_MODE_ON;
@@ -192,7 +192,7 @@ static int calculateMemoryCacheSize(Context context) {
192192
ActivityManager am = (ActivityManager) context.getSystemService(ACTIVITY_SERVICE);
193193
boolean largeHeap = (context.getApplicationInfo().flags & FLAG_LARGE_HEAP) != 0;
194194
int memoryClass = am.getMemoryClass();
195-
if (largeHeap && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
195+
if (largeHeap && SDK_INT >= HONEYCOMB) {
196196
memoryClass = ActivityManagerHoneycomb.getLargeMemoryClass(am);
197197
}
198198
// Target ~15% of the available heap.
@@ -229,7 +229,7 @@ static boolean isWebPFile(InputStream stream) throws IOException {
229229
return isWebPFile;
230230
}
231231

232-
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
232+
@TargetApi(HONEYCOMB)
233233
private static class ActivityManagerHoneycomb {
234234
static int getLargeMemoryClass(ActivityManager activityManager) {
235235
return activityManager.getLargeMemoryClass();
@@ -254,7 +254,7 @@ public PicassoThread(Runnable r) {
254254
}
255255
}
256256

257-
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
257+
@TargetApi(HONEYCOMB_MR1)
258258
private static class BitmapHoneycombMR1 {
259259
static int getByteCount(Bitmap bitmap) {
260260
return bitmap.getByteCount();

0 commit comments

Comments
 (0)