Merge "Translate the first/last view too." into gb-ub-photos-carlsbad
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index f9a4ec0..286d6e3 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -562,8 +562,8 @@
mViewInfo[curr] = buildInfoFromData(mViewInfo[prev].getID() + 1);
}
-
- for (int i = removedInfo; i < BUFFER_SIZE - 1; i++) {
+ // Translate the views to their original places.
+ for (int i = removedInfo; i < BUFFER_SIZE; i++) {
if (mViewInfo[i] != null) {
mViewInfo[i].setTranslationX(offsetX, mScale);
}
@@ -588,9 +588,6 @@
for (int i = removedInfo; i > 0; i--) {
mViewInfo[i] = mViewInfo[i - 1];
- if (mViewInfo[i] != null) {
- mViewInfo[i].setTranslationX(-offsetX, mScale);
- }
}
// pull data out from the DataAdapter for the first one.
@@ -599,6 +596,13 @@
if (mViewInfo[next] != null) {
mViewInfo[curr] = buildInfoFromData(mViewInfo[next].getID() - 1);
}
+
+ // Translate the views to their original places.
+ for (int i = removedInfo; i >= 0; i--) {
+ if (mViewInfo[i] != null) {
+ mViewInfo[i].setTranslationX(-offsetX, mScale);
+ }
+ }
}
// Now, slide every one back.