diff options
author | Ray Chen <raychen@google.com> | 2011-10-04 15:19:44 +0800 |
---|---|---|
committer | Ray Chen <raychen@google.com> | 2011-10-06 10:43:09 +0800 |
commit | dbf4ba12afba115888493caa34937643257e2bb1 (patch) | |
tree | a8de0fc06225c6c0ff29302e6ea315d49d8032fa /src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java | |
parent | 20cb268c47ce382859c6b3245e71a73e05a629d4 (diff) | |
download | android_packages_apps_Gallery2-dbf4ba12afba115888493caa34937643257e2bb1.tar.gz android_packages_apps_Gallery2-dbf4ba12afba115888493caa34937643257e2bb1.tar.bz2 android_packages_apps_Gallery2-dbf4ba12afba115888493caa34937643257e2bb1.zip |
Fix 5250813 Use new standardized no account screen on first launch
This CL also fixes a bug in AlbumSetDataAdapter's ReloadTask, which
causes empty screen after pause/resume.
Change-Id: I7991d40a790384105ccb3021e1e51ba3e5ec8635
Diffstat (limited to 'src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java')
-rw-r--r-- | src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java index bf6e1dfc3..5b01ce726 100644 --- a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java +++ b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java @@ -16,6 +16,10 @@ package com.android.gallery3d.ui; +import android.graphics.Bitmap; +import android.graphics.Color; +import android.os.Message; + import com.android.gallery3d.R; import com.android.gallery3d.app.GalleryActivity; import com.android.gallery3d.common.Utils; @@ -29,10 +33,6 @@ import com.android.gallery3d.util.GalleryUtils; import com.android.gallery3d.util.MediaSetUtils; import com.android.gallery3d.util.ThreadPool; -import android.graphics.Bitmap; -import android.graphics.Color; -import android.os.Message; - public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener { private static final String TAG = "GallerySlidingWindow"; private static final int MSG_LOAD_BITMAP_DONE = 0; @@ -47,7 +47,7 @@ public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener { private final AlbumSetView.Model mSource; private int mSize; - private AlbumSetView.LabelSpec mLabelSpec; + private final AlbumSetView.LabelSpec mLabelSpec; private int mContentStart = 0; private int mContentEnd = 0; @@ -61,11 +61,11 @@ public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener { private SelectionDrawer mSelectionDrawer; private final ColorTexture mWaitLoadingTexture; - private SynchronizedHandler mHandler; - private ThreadPool mThreadPool; + private final SynchronizedHandler mHandler; + private final ThreadPool mThreadPool; private int mActiveRequestCount = 0; - private String mLoadingLabel; + private final String mLoadingLabel; private boolean mIsActive = false; private static class MyAlbumSetItem extends AlbumSetItem { @@ -339,7 +339,7 @@ public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener { private final int mMediaType; private Texture mContent; private final long mDataVersion; - private boolean mIsPanorama; + private final boolean mIsPanorama; private boolean mWaitLoadingDisplayed; public GalleryDisplayItem(int slotIndex, int coverIndex, MediaItem item) { @@ -558,9 +558,9 @@ public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener { } public void onSizeChanged(int size) { - if (mSize != size) { + if (mIsActive && mSize != size) { mSize = size; - if (mListener != null && mIsActive) mListener.onSizeChanged(mSize); + if (mListener != null) mListener.onSizeChanged(mSize); } } |