From cf215ef2af781f3667e7f644b4af879ee892b17c Mon Sep 17 00:00:00 2001 From: RazorSharp Date: Mon, 1 Feb 2016 07:51:27 +0530 Subject: [PATCH] Eleven: Remove unnecessary local variables Change-Id: Ic92632873f75bd2d4569a4700a744a3ca17e99cb --- src/com/cyanogenmod/eleven/dragdrop/DragSortListView.java | 10 ++++------ src/com/cyanogenmod/eleven/lastfm/Caller.java | 3 +-- src/com/cyanogenmod/eleven/loaders/QueueLoader.java | 3 +-- src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java | 3 +-- .../eleven/ui/activities/preview/AudioPreviewActivity.java | 3 +-- src/com/cyanogenmod/eleven/utils/ImageUtils.java | 3 +-- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/com/cyanogenmod/eleven/dragdrop/DragSortListView.java b/src/com/cyanogenmod/eleven/dragdrop/DragSortListView.java index 85a2fbb..e7be9eb 100644 --- a/src/com/cyanogenmod/eleven/dragdrop/DragSortListView.java +++ b/src/com/cyanogenmod/eleven/dragdrop/DragSortListView.java @@ -889,7 +889,6 @@ public class DragSortListView extends ListView { // Log.d("mobeta", "edgeTop="+edgeTop+" edgeBot="+edgeBottom); final int slideRgnHeight = (int)(0.5f * mSlideRegionFrac * edgeToEdge); - final float slideRgnHeightF = slideRgnHeight; final int slideEdgeTop = edgeTop + slideRgnHeight; final int slideEdgeBottom = edgeBottom - slideRgnHeight; @@ -897,7 +896,7 @@ public class DragSortListView extends ListView { if (mFloatViewMid < slideEdgeTop) { mFirstExpPos = itemPos - 1; mSecondExpPos = itemPos; - mSlideFrac = 0.5f * (slideEdgeTop - mFloatViewMid) / slideRgnHeightF; + mSlideFrac = 0.5f * (slideEdgeTop - mFloatViewMid) / (float) slideRgnHeight; // Log.d("mobeta", // "firstExp="+mFirstExpPos+" secExp="+mSecondExpPos+" slideFrac="+mSlideFrac); } else if (mFloatViewMid < slideEdgeBottom) { @@ -906,7 +905,7 @@ public class DragSortListView extends ListView { } else { mFirstExpPos = itemPos; mSecondExpPos = itemPos + 1; - mSlideFrac = 0.5f * (1.0f + (edgeBottom - mFloatViewMid) / slideRgnHeightF); + mSlideFrac = 0.5f * (1.0f + (edgeBottom - mFloatViewMid) / (float) slideRgnHeight); // Log.d("mobeta", // "firstExp="+mFirstExpPos+" secExp="+mSecondExpPos+" slideFrac="+mSlideFrac); } @@ -1186,10 +1185,9 @@ public class DragSortListView extends ListView { private void updateScrollStarts() { final int padTop = getPaddingTop(); final int listHeight = getHeight() - padTop - getPaddingBottom(); - final float heightF = listHeight; - mUpScrollStartYF = padTop + mDragUpScrollStartFrac * heightF; - mDownScrollStartYF = padTop + (1.0f - mDragDownScrollStartFrac) * heightF; + mUpScrollStartYF = padTop + mDragUpScrollStartFrac * (float) listHeight; + mDownScrollStartYF = padTop + (1.0f - mDragDownScrollStartFrac) * (float) listHeight; mUpScrollStartY = (int)mUpScrollStartYF; mDownScrollStartY = (int)mDownScrollStartYF; diff --git a/src/com/cyanogenmod/eleven/lastfm/Caller.java b/src/com/cyanogenmod/eleven/lastfm/Caller.java index a6e8b64..1315132 100644 --- a/src/com/cyanogenmod/eleven/lastfm/Caller.java +++ b/src/com/cyanogenmod/eleven/lastfm/Caller.java @@ -148,8 +148,7 @@ public class Caller { } try { - final Result result = createResultFromInputStream(inputStream); - lastResult = result; + lastResult = createResultFromInputStream(inputStream); } catch (final IOException ioEx) { Log.e(TAG, "Failed to read document", ioEx); lastResult = new Result(ioEx.getLocalizedMessage()); diff --git a/src/com/cyanogenmod/eleven/loaders/QueueLoader.java b/src/com/cyanogenmod/eleven/loaders/QueueLoader.java index cab279c..00caa52 100644 --- a/src/com/cyanogenmod/eleven/loaders/QueueLoader.java +++ b/src/com/cyanogenmod/eleven/loaders/QueueLoader.java @@ -104,7 +104,6 @@ public class QueueLoader extends WrappedAsyncTaskLoader> { * @return The {@link Cursor} used to run the song query. */ public static final Cursor makeQueueCursor(final Context context) { - final Cursor cursor = new NowPlayingCursor(context); - return cursor; + return new NowPlayingCursor(context); } } diff --git a/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java b/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java index a66c6c0..1462f9a 100644 --- a/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java +++ b/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java @@ -195,10 +195,9 @@ public class HomeActivity extends SlidingPanelActivity implements @Override protected BitmapWithColors doInBackground(Void... params) { ImageFetcher imageFetcher = ImageFetcher.getInstance(HomeActivity.this); - final BitmapWithColors bitmap = imageFetcher.getArtwork( + return imageFetcher.getArtwork( MusicUtils.getAlbumName(), MusicUtils.getCurrentAlbumId(), MusicUtils.getArtistName(), true); - return bitmap; } @Override protected void onPostExecute(BitmapWithColors bmc) { diff --git a/src/com/cyanogenmod/eleven/ui/activities/preview/AudioPreviewActivity.java b/src/com/cyanogenmod/eleven/ui/activities/preview/AudioPreviewActivity.java index b116284..cbc7129 100644 --- a/src/com/cyanogenmod/eleven/ui/activities/preview/AudioPreviewActivity.java +++ b/src/com/cyanogenmod/eleven/ui/activities/preview/AudioPreviewActivity.java @@ -458,8 +458,7 @@ public class AudioPreviewActivity extends Activity implements MediaPlayer.OnComp mLastOrientationWhileBuffering = getRequestedOrientation(); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR); } - String path = getNameFromPath(); - mPreviewSong.TITLE = path; + mPreviewSong.TITLE = getNameFromPath(); setNames(); } diff --git a/src/com/cyanogenmod/eleven/utils/ImageUtils.java b/src/com/cyanogenmod/eleven/utils/ImageUtils.java index 12fb4ab..69e0c0b 100644 --- a/src/com/cyanogenmod/eleven/utils/ImageUtils.java +++ b/src/com/cyanogenmod/eleven/utils/ImageUtils.java @@ -296,9 +296,8 @@ public class ImageUtils { int dstHeight = (int) Math.ceil(srcHeight * scale); int dstWidth = (int) Math.ceil(srcWidth * scale); Bitmap scaledBitmap = Bitmap.createScaledBitmap(src, dstWidth, dstHeight, false); - Bitmap croppedBitmap = Bitmap.createBitmap(scaledBitmap, 0, 0, viewWidth, viewHeight); - return croppedBitmap; + return Bitmap.createBitmap(scaledBitmap, 0, 0, viewWidth, viewHeight); } } -- 2.11.0