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
diff --git a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
index bf6e1df..5b01ce7 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.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 @@
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 @@
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 @@
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 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);
}
}
diff --git a/src/com/android/gallery3d/ui/AlbumSetView.java b/src/com/android/gallery3d/ui/AlbumSetView.java
index 89dfe4a..d6202ef 100644
--- a/src/com/android/gallery3d/ui/AlbumSetView.java
+++ b/src/com/android/gallery3d/ui/AlbumSetView.java
@@ -16,14 +16,14 @@
package com.android.gallery3d.ui;
+import android.graphics.Rect;
+
import com.android.gallery3d.app.GalleryActivity;
import com.android.gallery3d.common.Utils;
import com.android.gallery3d.data.MediaItem;
import com.android.gallery3d.data.MediaSet;
import com.android.gallery3d.ui.PositionRepository.Position;
-import android.graphics.Rect;
-
import java.util.Random;
public class AlbumSetView extends SlotView {
@@ -35,8 +35,8 @@
private int mVisibleStart;
private int mVisibleEnd;
- private Random mRandom = new Random();
- private long mSeed = mRandom.nextLong();
+ private final Random mRandom = new Random();
+ private final long mSeed = mRandom.nextLong();
private AlbumSetSlidingWindow mDataWindow;
private final GalleryActivity mActivity;
diff --git a/src/com/android/gallery3d/ui/SlotView.java b/src/com/android/gallery3d/ui/SlotView.java
index 5d0922e..cc34b2a 100644
--- a/src/com/android/gallery3d/ui/SlotView.java
+++ b/src/com/android/gallery3d/ui/SlotView.java
@@ -16,17 +16,17 @@
package com.android.gallery3d.ui;
-import com.android.gallery3d.anim.Animation;
-import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.ui.PositionRepository.Position;
-import com.android.gallery3d.util.LinkedNode;
-
import android.content.Context;
import android.graphics.Rect;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.animation.DecelerateInterpolator;
+import com.android.gallery3d.anim.Animation;
+import com.android.gallery3d.common.Utils;
+import com.android.gallery3d.ui.PositionRepository.Position;
+import com.android.gallery3d.util.LinkedNode;
+
import java.util.ArrayList;
import java.util.HashMap;
@@ -62,7 +62,7 @@
private UserInteractionListener mUIListener;
// Use linked hash map to keep the rendering order
- private HashMap<DisplayItem, ItemEntry> mItems =
+ private final HashMap<DisplayItem, ItemEntry> mItems =
new HashMap<DisplayItem, ItemEntry>();
public LinkedNode.List<ItemEntry> mItemList = LinkedNode.newList();
