Gallery: fix several lint issues

CRs-Fixed: 1024516
Change-Id: Ia629e83e244fd1400b87edfefdba0b9a540d8153

2 files changed, 9 insertions, 25 deletions

diff --git a/src/com/android/gallery3d/ui/TimeLineSlidingWindow.java b/src/com/android/gallery3d/ui/TimeLineSlidingWindow.java
index 5041ba683..d37d4e812 100644
--- a/src/com/android/gallery3d/ui/TimeLineSlidingWindow.java
+++ b/src/com/android/gallery3d/ui/TimeLineSlidingWindow.java
@@ -32,8 +32,6 @@ import com.android.gallery3d.util.Future;
 import com.android.gallery3d.util.FutureListener;
 import com.android.gallery3d.util.JobLimiter;
 
-import java.util.ArrayList;
-
 public class TimeLineSlidingWindow implements TimeLineDataLoader.DataListener {
     @SuppressWarnings("unused")
     private static final String TAG = "TimeLineSlidingWindow";
@@ -41,10 +39,9 @@ public class TimeLineSlidingWindow implements TimeLineDataLoader.DataListener {
     private static final int MSG_UPDATE_ENTRY = 0;
     private static final int JOB_LIMIT = 2;
 
-    public static interface Listener {
-        public void onSizeChanged(int[] size);
-        public void onContentChanged();
-        public int getTitleWidth();
+    public interface Listener {
+        void onSizeChanged(int[] size);
+        void onContentChanged();
     }
 
     public static class AlbumEntry {
@@ -76,16 +73,10 @@ public class TimeLineSlidingWindow implements TimeLineDataLoader.DataListener {
     private int mActiveRequestCount = 0;
     private boolean mIsActive = false;
 
-    private TimeLineTitleMaker mTitleMaker;
-    private int mTitleSize;
-    private int mTitleContentStart = 0;
-    private int mTitleContentEnd = 0;
-    private final int TITLE_CACHE_SIZE = 15;
+    private final TimeLineTitleMaker mTitleMaker;
 
-    public TimeLineSlidingWindow(AbstractGalleryActivity activity,
-            TimeLineDataLoader source,
-                                     int cacheSize, TimeLineSlotRenderer.LabelSpec labelSpec,
-                                     SelectionManager selection, TimeLineSlotView slotView) {
+    public TimeLineSlidingWindow(AbstractGalleryActivity activity, TimeLineDataLoader source,
+            int cacheSize, TimeLineSlotRenderer.LabelSpec labelSpec, TimeLineSlotView slotView) {
         source.setDataListener(this);
         mSource = source;
         mData = new AlbumEntry[cacheSize];
@@ -111,11 +102,10 @@ public class TimeLineSlidingWindow implements TimeLineDataLoader.DataListener {
         if (!isActiveSlot(slotIndex)) {
             return null;
         }
-        AlbumEntry item = mData[slotIndex % mData.length];
-        return item;
+        return mData[slotIndex % mData.length];
     }
 
-    public boolean isActiveSlot(int slotIndex) {
+    private boolean isActiveSlot(int slotIndex) {
         return slotIndex >= mActiveStart && slotIndex < mActiveEnd;
     }
 
diff --git a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
index a9ee9a8db..575b9d637 100644
--- a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
@@ -130,12 +130,6 @@ public class TimeLineSlotRenderer extends AbstractSlotRenderer {
             mSlotView.setSlotCount(size);
             mSlotView.invalidate();
         }
-
-        @Override
-        public int getTitleWidth() {
-            return mSlotView.getTitleWidth();
-        }
-
     }
 
     public void resume() {
@@ -176,7 +170,7 @@ public class TimeLineSlotRenderer extends AbstractSlotRenderer {
         }
         if (model != null) {
             mDataWindow = new TimeLineSlidingWindow(mActivity, model, CACHE_SIZE, mLabelSpec,
-                    mSelectionManager, mSlotView);
+                    mSlotView);
             mDataWindow.setListener(new MyDataModelListener());
         }
     }