diff options
12 files changed, 71 insertions, 91 deletions
diff --git a/src/com/android/gallery3d/app/AlbumDataAdapter.java b/src/com/android/gallery3d/app/AlbumDataLoader.java index ec46e50e5..a99cf93fd 100644 --- a/src/com/android/gallery3d/app/AlbumDataAdapter.java +++ b/src/com/android/gallery3d/app/AlbumDataLoader.java @@ -26,7 +26,7 @@ import com.android.gallery3d.data.DataManager; import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.data.MediaObject; import com.android.gallery3d.data.MediaSet; -import com.android.gallery3d.ui.AlbumView; +import com.android.gallery3d.ui.AlbumSlotRenderer; import com.android.gallery3d.ui.SynchronizedHandler; import java.util.ArrayList; @@ -35,7 +35,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; -public class AlbumDataAdapter implements AlbumView.Model { +public class AlbumDataLoader { @SuppressWarnings("unused") private static final String TAG = "AlbumDataAdapter"; private static final int DATA_CACHE_SIZE = 1000; @@ -51,6 +51,11 @@ public class AlbumDataAdapter implements AlbumView.Model { private final long[] mItemVersion; private final long[] mSetVersion; + public static interface DataListener { + public void onContentChanged(int index); + public void onSizeChanged(int size); + } + private int mActiveStart = 0; private int mActiveEnd = 0; @@ -63,13 +68,13 @@ public class AlbumDataAdapter implements AlbumView.Model { private final Handler mMainHandler; private int mSize = 0; - private AlbumView.ModelListener mModelListener; + private DataListener mDataListener; private MySourceListener mSourceListener = new MySourceListener(); private LoadingListener mLoadingListener; private ReloadTask mReloadTask; - public AlbumDataAdapter(GalleryActivity context, MediaSet mediaSet) { + public AlbumDataLoader(GalleryActivity context, MediaSet mediaSet) { mSource = mediaSet; mData = new MediaItem[DATA_CACHE_SIZE]; @@ -189,8 +194,8 @@ public class AlbumDataAdapter implements AlbumView.Model { } } - public void setModelListener(AlbumView.ModelListener listener) { - mModelListener = listener; + public void setDataListener(DataListener listener) { + mDataListener = listener; } public void setLoadingListener(LoadingListener listener) { @@ -258,7 +263,7 @@ public class AlbumDataAdapter implements AlbumView.Model { mSourceVersion = info.version; if (mSize != info.size) { mSize = info.size; - if (mModelListener != null) mModelListener.onSizeChanged(mSize); + if (mDataListener != null) mDataListener.onSizeChanged(mSize); if (mContentEnd > mSize) mContentEnd = mSize; if (mActiveEnd > mSize) mActiveEnd = mSize; } @@ -277,8 +282,8 @@ public class AlbumDataAdapter implements AlbumView.Model { if (mItemVersion[index] != itemVersion) { mItemVersion[index] = itemVersion; mData[index] = updateItem; - if (mModelListener != null && i >= mActiveStart && i < mActiveEnd) { - mModelListener.onWindowContentChanged(i); + if (mDataListener != null && i >= mActiveStart && i < mActiveEnd) { + mDataListener.onContentChanged(i); } } } diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index af6cb5057..efffe4075 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -41,7 +41,7 @@ import com.android.gallery3d.data.MtpDevice; import com.android.gallery3d.data.Path; import com.android.gallery3d.ui.ActionModeHandler; import com.android.gallery3d.ui.ActionModeHandler.ActionModeListener; -import com.android.gallery3d.ui.AlbumView; +import com.android.gallery3d.ui.AlbumSlotRenderer; import com.android.gallery3d.ui.DetailsHelper; import com.android.gallery3d.ui.DetailsHelper.CloseListener; import com.android.gallery3d.ui.GLCanvas; @@ -76,12 +76,12 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster private static final boolean TEST_CAMERA_PREVIEW = false; private boolean mIsActive = false; - private AlbumView mAlbumView; + private AlbumSlotRenderer mAlbumView; private Path mMediaSetPath; private String mParentMediaSetString; private SlotView mSlotView; - private AlbumDataAdapter mAlbumDataAdapter; + private AlbumDataLoader mAlbumDataAdapter; protected SelectionManager mSelectionManager; private Vibrator mVibrator; @@ -343,7 +343,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster mSelectionManager.setSelectionListener(this); Config.AlbumPage config = Config.AlbumPage.get((Context) mActivity); mSlotView = new SlotView((Context) mActivity, config.slotViewSpec); - mAlbumView = new AlbumView(mActivity, mSlotView, mSelectionManager); + mAlbumView = new AlbumSlotRenderer(mActivity, mSlotView, mSelectionManager); mSlotView.setSlotRenderer(mAlbumView); mRootPane.addComponent(mSlotView); mSlotView.setListener(new SlotView.SimpleListener() { @@ -383,7 +383,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster Utils.fail("MediaSet is null. Path = %s", mMediaSetPath); } mSelectionManager.setSourceMediaSet(mMediaSet); - mAlbumDataAdapter = new AlbumDataAdapter(mActivity, mMediaSet); + mAlbumDataAdapter = new AlbumDataLoader(mActivity, mMediaSet); mAlbumDataAdapter.setLoadingListener(new MyLoadingListener()); mAlbumView.setModel(mAlbumDataAdapter); } diff --git a/src/com/android/gallery3d/app/AlbumSetDataAdapter.java b/src/com/android/gallery3d/app/AlbumSetDataLoader.java index eea039d19..1d3ab7173 100644 --- a/src/com/android/gallery3d/app/AlbumSetDataAdapter.java +++ b/src/com/android/gallery3d/app/AlbumSetDataLoader.java @@ -27,7 +27,6 @@ import com.android.gallery3d.data.DataManager; import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.data.MediaObject; import com.android.gallery3d.data.MediaSet; -import com.android.gallery3d.ui.AlbumSetView; import com.android.gallery3d.ui.SynchronizedHandler; import java.util.Arrays; @@ -35,7 +34,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; -public class AlbumSetDataAdapter implements AlbumSetView.Model { +public class AlbumSetDataLoader { @SuppressWarnings("unused") private static final String TAG = "AlbumSetDataAdapter"; @@ -47,6 +46,11 @@ public class AlbumSetDataAdapter implements AlbumSetView.Model { private static final int MSG_LOAD_FINISH = 2; private static final int MSG_RUN_OBJECT = 3; + public static interface DataListener { + public void onContentChanged(int index); + public void onSizeChanged(int size); + } + private final MediaSet[] mData; private final MediaItem[] mCoverItem; private final long[] mItemVersion; @@ -62,7 +66,7 @@ public class AlbumSetDataAdapter implements AlbumSetView.Model { private long mSourceVersion = MediaObject.INVALID_DATA_VERSION; private int mSize; - private AlbumSetView.ModelListener mModelListener; + private DataListener mDataListener; private LoadingListener mLoadingListener; private ReloadTask mReloadTask; @@ -70,7 +74,7 @@ public class AlbumSetDataAdapter implements AlbumSetView.Model { private final MySourceListener mSourceListener = new MySourceListener(); - public AlbumSetDataAdapter(GalleryActivity activity, MediaSet albumSet, int cacheSize) { + public AlbumSetDataLoader(GalleryActivity activity, MediaSet albumSet, int cacheSize) { mSource = Utils.checkNotNull(albumSet); mCoverItem = new MediaItem[cacheSize]; mData = new MediaSet[cacheSize]; @@ -197,8 +201,8 @@ public class AlbumSetDataAdapter implements AlbumSetView.Model { } } - public void setModelListener(AlbumSetView.ModelListener listener) { - mModelListener = listener; + public void setModelListener(DataListener listener) { + mDataListener = listener; } public void setLoadingListener(LoadingListener listener) { @@ -259,7 +263,7 @@ public class AlbumSetDataAdapter implements AlbumSetView.Model { mSourceVersion = info.version; if (mSize != info.size) { mSize = info.size; - if (mModelListener != null) mModelListener.onSizeChanged(mSize); + if (mDataListener != null) mDataListener.onSizeChanged(mSize); if (mContentEnd > mSize) mContentEnd = mSize; if (mActiveEnd > mSize) mActiveEnd = mSize; } @@ -272,9 +276,9 @@ public class AlbumSetDataAdapter implements AlbumSetView.Model { mItemVersion[pos] = itemVersion; mData[pos] = info.item; mCoverItem[pos] = info.cover; - if (mModelListener != null + if (mDataListener != null && info.index >= mActiveStart && info.index < mActiveEnd) { - mModelListener.onWindowContentChanged(info.index); + mDataListener.onContentChanged(info.index); } } return null; diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index 7cdb85628..cbd6789b4 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -40,7 +40,7 @@ import com.android.gallery3d.picasasource.PicasaSource; import com.android.gallery3d.settings.GallerySettings; import com.android.gallery3d.ui.ActionModeHandler; import com.android.gallery3d.ui.ActionModeHandler.ActionModeListener; -import com.android.gallery3d.ui.AlbumSetView; +import com.android.gallery3d.ui.AlbumSetSlotRenderer; import com.android.gallery3d.ui.DetailsHelper; import com.android.gallery3d.ui.DetailsHelper.CloseListener; import com.android.gallery3d.ui.GLCanvas; @@ -70,7 +70,7 @@ public class AlbumSetPage extends ActivityState implements private boolean mIsActive = false; private SlotView mSlotView; - private AlbumSetView mAlbumSetView; + private AlbumSetSlotRenderer mAlbumSetView; private MediaSet mMediaSet; private String mTitle; @@ -81,7 +81,7 @@ public class AlbumSetPage extends ActivityState implements private Vibrator mVibrator; protected SelectionManager mSelectionManager; - private AlbumSetDataAdapter mAlbumSetDataAdapter; + private AlbumSetDataLoader mAlbumSetDataAdapter; private boolean mGetContent; private boolean mGetAlbum; @@ -332,7 +332,7 @@ public class AlbumSetPage extends ActivityState implements String mediaPath = data.getString(AlbumSetPage.KEY_MEDIA_PATH); mMediaSet = mActivity.getDataManager().getMediaSet(mediaPath); mSelectionManager.setSourceMediaSet(mMediaSet); - mAlbumSetDataAdapter = new AlbumSetDataAdapter( + mAlbumSetDataAdapter = new AlbumSetDataLoader( mActivity, mMediaSet, DATA_CACHE_SIZE); mAlbumSetDataAdapter.setLoadingListener(new MyLoadingListener()); mAlbumSetView.setModel(mAlbumSetDataAdapter); @@ -344,7 +344,7 @@ public class AlbumSetPage extends ActivityState implements Config.AlbumSetPage config = Config.AlbumSetPage.get((Context) mActivity); mSlotView = new SlotView((Context) mActivity, config.slotViewSpec); - mAlbumSetView = new AlbumSetView( + mAlbumSetView = new AlbumSetSlotRenderer( mActivity, mSelectionManager, mSlotView, config.labelSpec); mSlotView.setSlotRenderer(mAlbumSetView); mSlotView.setListener(new SlotView.SimpleListener() { diff --git a/src/com/android/gallery3d/app/Config.java b/src/com/android/gallery3d/app/Config.java index 46ea7c89f..a95427b35 100644 --- a/src/com/android/gallery3d/app/Config.java +++ b/src/com/android/gallery3d/app/Config.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.res.Resources; import com.android.gallery3d.R; -import com.android.gallery3d.ui.AlbumSetView; +import com.android.gallery3d.ui.AlbumSetSlotRenderer; import com.android.gallery3d.ui.SlotView; final class Config { @@ -28,7 +28,7 @@ final class Config { private static AlbumSetPage sInstance; public SlotView.Spec slotViewSpec; - public AlbumSetView.LabelSpec labelSpec; + public AlbumSetSlotRenderer.LabelSpec labelSpec; public static synchronized AlbumSetPage get(Context context) { if (sInstance == null) { @@ -45,7 +45,7 @@ final class Config { slotViewSpec.rowsPort = r.getInteger(R.integer.albumset_rows_port); slotViewSpec.slotGap = r.getDimensionPixelSize(R.dimen.albumset_slot_gap); - labelSpec = new AlbumSetView.LabelSpec(); + labelSpec = new AlbumSetSlotRenderer.LabelSpec(); labelSpec.labelBackgroundHeight = r.getDimensionPixelSize( R.dimen.albumset_label_background_height); labelSpec.titleOffset = r.getDimensionPixelSize( diff --git a/src/com/android/gallery3d/app/ManageCachePage.java b/src/com/android/gallery3d/app/ManageCachePage.java index c998cd83a..5793b7065 100644 --- a/src/com/android/gallery3d/app/ManageCachePage.java +++ b/src/com/android/gallery3d/app/ManageCachePage.java @@ -69,7 +69,7 @@ public class ManageCachePage extends ActivityState implements protected SelectionManager mSelectionManager; protected ManageCacheDrawer mSelectionDrawer; - private AlbumSetDataAdapter mAlbumSetDataAdapter; + private AlbumSetDataLoader mAlbumSetDataAdapter; private float mUserDistance; // in pixel private EyePosition mEyePosition; @@ -274,7 +274,7 @@ public class ManageCachePage extends ActivityState implements mSelectionManager.setAutoLeaveSelectionMode(false); mSelectionManager.enterSelectionMode(); - mAlbumSetDataAdapter = new AlbumSetDataAdapter( + mAlbumSetDataAdapter = new AlbumSetDataLoader( mActivity, mMediaSet, DATA_CACHE_SIZE); mSelectionDrawer.setModel(mAlbumSetDataAdapter); } diff --git a/src/com/android/gallery3d/ui/AlbumLabelMaker.java b/src/com/android/gallery3d/ui/AlbumLabelMaker.java index 317fe52e3..9fdc234ab 100644 --- a/src/com/android/gallery3d/ui/AlbumLabelMaker.java +++ b/src/com/android/gallery3d/ui/AlbumLabelMaker.java @@ -28,7 +28,7 @@ public class AlbumLabelMaker { private static final int BORDER_SIZE = 1; private static final int BACKGROUND_COLOR = 0x60000000; // 36% Dark - private final AlbumSetView.LabelSpec mSpec; + private final AlbumSetSlotRenderer.LabelSpec mSpec; private final TextPaint mTitlePaint; private final TextPaint mCountPaint; private final Context mContext; @@ -41,7 +41,7 @@ public class AlbumLabelMaker { private final LazyLoadedBitmap mCameraIcon; private final LazyLoadedBitmap mMtpIcon; - public AlbumLabelMaker(Context context, AlbumSetView.LabelSpec spec) { + public AlbumLabelMaker(Context context, AlbumSetSlotRenderer.LabelSpec spec) { mContext = context; mSpec = spec; mTitlePaint = getTextPaint(spec.titleFontSize, FONT_COLOR_TITLE, false); @@ -147,7 +147,7 @@ public class AlbumLabelMaker { @Override public Bitmap run(JobContext jc) { MediaSet album = mAlbum; - AlbumSetView.LabelSpec s = mSpec; + AlbumSetSlotRenderer.LabelSpec s = mSpec; String title = Utils.ensureNotNull( (album == null) ? mTitle : album.getName()); diff --git a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java index 784093c9f..5105c9b28 100644 --- a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java +++ b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java @@ -20,6 +20,7 @@ import android.graphics.Bitmap; import android.os.Message; import com.android.gallery3d.R; +import com.android.gallery3d.app.AlbumSetDataLoader; import com.android.gallery3d.app.GalleryActivity; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.DataSourceType; @@ -32,7 +33,7 @@ import com.android.gallery3d.util.FutureListener; import com.android.gallery3d.util.GalleryUtils; import com.android.gallery3d.util.ThreadPool; -public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener { +public class AlbumSetSlidingWindow implements AlbumSetDataLoader.DataListener { private static final String TAG = "AlbumSetSlidingWindow"; private static final int MSG_UPDATE_ALBUM_ENTRY = 1; @@ -41,7 +42,7 @@ public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener { public void onContentChanged(); } - private final AlbumSetView.Model mSource; + private final AlbumSetDataLoader mSource; private int mSize; private int mContentStart = 0; @@ -85,7 +86,7 @@ public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener { } public AlbumSetSlidingWindow(GalleryActivity activity, - AlbumSetView.Model source, AlbumSetView.LabelSpec labelSpec, int cacheSize) { + AlbumSetDataLoader source, AlbumSetSlotRenderer.LabelSpec labelSpec, int cacheSize) { source.setModelListener(this); mSource = source; mData = new AlbumSetEntry[cacheSize]; @@ -334,7 +335,7 @@ public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener { } @Override - public void onWindowContentChanged(int index) { + public void onContentChanged(int index) { if (!mIsActive) { // paused, ignore slot changed event return; diff --git a/src/com/android/gallery3d/ui/AlbumSetView.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java index 03b92308b..d20c387ae 100644 --- a/src/com/android/gallery3d/ui/AlbumSetView.java +++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java @@ -18,15 +18,13 @@ package com.android.gallery3d.ui; import android.content.Context; +import com.android.gallery3d.app.AlbumSetDataLoader; import com.android.gallery3d.app.GalleryActivity; -import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.data.MediaObject; -import com.android.gallery3d.data.MediaSet; import com.android.gallery3d.data.Path; import com.android.gallery3d.ui.AlbumSetSlidingWindow.AlbumSetEntry; -// TODO: rename to AlbumSetRenderer -public class AlbumSetView extends AbstractSlotRenderer { +public class AlbumSetSlotRenderer extends AbstractSlotRenderer { @SuppressWarnings("unused") private static final String TAG = "AlbumSetView"; private static final int CACHE_SIZE = 96; @@ -44,19 +42,6 @@ public class AlbumSetView extends AbstractSlotRenderer { private Path mHighlightItemPath = null; private boolean mInSelectionMode; - public static interface Model { - public MediaItem getCoverItem(int index); - public MediaSet getMediaSet(int index); - public int size(); - public void setActiveWindow(int start, int end); - public void setModelListener(ModelListener listener); - } - - public static interface ModelListener { - public void onWindowContentChanged(int index); - public void onSizeChanged(int size); - } - public static class LabelSpec { public int labelBackgroundHeight; public int titleOffset; @@ -67,7 +52,7 @@ public class AlbumSetView extends AbstractSlotRenderer { public int iconSize; } - public AlbumSetView(GalleryActivity activity, SelectionManager selectionManager, + public AlbumSetSlotRenderer(GalleryActivity activity, SelectionManager selectionManager, SlotView slotView, LabelSpec labelSpec) { super ((Context) activity); mActivity = activity; @@ -93,7 +78,7 @@ public class AlbumSetView extends AbstractSlotRenderer { mSlotView.invalidate(); } - public void setModel(AlbumSetView.Model model) { + public void setModel(AlbumSetDataLoader model) { if (mDataWindow != null) { mDataWindow.setListener(null); mDataWindow = null; diff --git a/src/com/android/gallery3d/ui/AlbumSlidingWindow.java b/src/com/android/gallery3d/ui/AlbumSlidingWindow.java index 4fbbe190d..9ce1fa3cb 100644 --- a/src/com/android/gallery3d/ui/AlbumSlidingWindow.java +++ b/src/com/android/gallery3d/ui/AlbumSlidingWindow.java @@ -19,6 +19,7 @@ package com.android.gallery3d.ui; import android.graphics.Bitmap; import android.os.Message; +import com.android.gallery3d.app.AlbumDataLoader; import com.android.gallery3d.app.GalleryActivity; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.MediaItem; @@ -28,7 +29,7 @@ import com.android.gallery3d.util.FutureListener; import com.android.gallery3d.util.GalleryUtils; import com.android.gallery3d.util.JobLimiter; -public class AlbumSlidingWindow implements AlbumView.ModelListener { +public class AlbumSlidingWindow implements AlbumDataLoader.DataListener { @SuppressWarnings("unused") private static final String TAG = "AlbumSlidingWindow"; @@ -51,7 +52,7 @@ public class AlbumSlidingWindow implements AlbumView.ModelListener { private BitmapLoader contentLoader; } - private final AlbumView.Model mSource; + private final AlbumDataLoader mSource; private final AlbumEntry mData[]; private final SynchronizedHandler mHandler; private final JobLimiter mThreadPool; @@ -71,8 +72,8 @@ public class AlbumSlidingWindow implements AlbumView.ModelListener { private boolean mIsActive = false; public AlbumSlidingWindow(GalleryActivity activity, - AlbumView.Model source, int cacheSize) { - source.setModelListener(this); + AlbumDataLoader source, int cacheSize) { + source.setDataListener(this); mSource = source; mData = new AlbumEntry[cacheSize]; mSize = source.size(); @@ -253,15 +254,6 @@ public class AlbumSlidingWindow implements AlbumView.ModelListener { mData[slotIndex % mData.length] = entry; } - private void updateSlotContent(int slotIndex) { - freeSlotContent(slotIndex); - prepareSlotContent(slotIndex); - updateAllImageRequests(); - if (mListener != null && isActiveSlot(slotIndex)) { - mListener.onContentChanged(); - } - } - private void updateAllImageRequests() { mActiveRequestCount = 0; for (int i = mActiveStart, n = mActiveEnd; i < n; ++i) { @@ -326,9 +318,14 @@ public class AlbumSlidingWindow implements AlbumView.ModelListener { } @Override - public void onWindowContentChanged(int index) { + public void onContentChanged(int index) { if (index >= mContentStart && index < mContentEnd && mIsActive) { - updateSlotContent(index); + freeSlotContent(index); + prepareSlotContent(index); + updateAllImageRequests(); + if (mListener != null && isActiveSlot(index)) { + mListener.onContentChanged(); + } } } diff --git a/src/com/android/gallery3d/ui/AlbumView.java b/src/com/android/gallery3d/ui/AlbumSlotRenderer.java index 04c29143e..f996a82d8 100644 --- a/src/com/android/gallery3d/ui/AlbumView.java +++ b/src/com/android/gallery3d/ui/AlbumSlotRenderer.java @@ -18,12 +18,12 @@ package com.android.gallery3d.ui; import android.content.Context; +import com.android.gallery3d.app.AlbumDataLoader; import com.android.gallery3d.app.GalleryActivity; -import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.data.MediaObject; import com.android.gallery3d.data.Path; -public class AlbumView extends AbstractSlotRenderer { +public class AlbumSlotRenderer extends AbstractSlotRenderer { private static final int PLACEHOLDER_COLOR = 0xFF222222; @SuppressWarnings("unused") @@ -40,19 +40,7 @@ public class AlbumView extends AbstractSlotRenderer { private Path mHighlightItemPath = null; private boolean mInSelectionMode; - public static interface Model { - public int size(); - public MediaItem get(int index); - public void setActiveWindow(int start, int end); - public void setModelListener(ModelListener listener); - } - - public static interface ModelListener { - public void onWindowContentChanged(int index); - public void onSizeChanged(int size); - } - - public AlbumView(GalleryActivity activity, SlotView slotView, + public AlbumSlotRenderer(GalleryActivity activity, SlotView slotView, SelectionManager selectionManager) { super((Context) activity); mActivity = activity; @@ -75,7 +63,7 @@ public class AlbumView extends AbstractSlotRenderer { mSlotView.invalidate(); } - public void setModel(Model model) { + public void setModel(AlbumDataLoader model) { if (mDataWindow != null) { mDataWindow.setListener(null); mSlotView.setSlotCount(0); diff --git a/src/com/android/gallery3d/ui/ManageCacheDrawer.java b/src/com/android/gallery3d/ui/ManageCacheDrawer.java index d6495e8e9..ba31fc653 100644 --- a/src/com/android/gallery3d/ui/ManageCacheDrawer.java +++ b/src/com/android/gallery3d/ui/ManageCacheDrawer.java @@ -25,7 +25,7 @@ import com.android.gallery3d.data.MediaSet; import com.android.gallery3d.data.Path; import com.android.gallery3d.ui.AlbumSetSlidingWindow.AlbumSetEntry; -public class ManageCacheDrawer extends AlbumSetView { +public class ManageCacheDrawer extends AlbumSetSlotRenderer { private final ResourceTexture mCheckedItem; private final ResourceTexture mUnCheckedItem; private final SelectionManager mSelectionManager; |