summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-08-19 18:47:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-19 18:47:10 +0000
commite98a59afc89fc97bc619ef8c3aa66781061592f8 (patch)
tree12e28aa074adc19d45758a8cf7840e4f3127d3aa /src
parent58dfa0fb61e0499fdb108143da90014c463f05a2 (diff)
parente5b3ce3da8537b7a6bb971f293a5940f117a7a3f (diff)
downloadandroid_packages_apps_Snap-e98a59afc89fc97bc619ef8c3aa66781061592f8.tar.gz
android_packages_apps_Snap-e98a59afc89fc97bc619ef8c3aa66781061592f8.tar.bz2
android_packages_apps_Snap-e98a59afc89fc97bc619ef8c3aa66781061592f8.zip
Merge "Don't refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraActivity.java15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 18fcee6cd..b58262b71 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -624,21 +624,6 @@ public class CameraActivity extends Activity
mCurrentModule.onResumeAfterSuper();
setSwipingEnabled(true);
-
- // We might be returning from an editor that changed the current item.
- updateCurrentDataItem();
- }
-
- private void updateCurrentDataItem() {
- int currentDataId = mFilmStripView.getCurrentId();
- if (currentDataId < 0) {
- return;
- }
- final LocalData localData = mDataAdapter.getLocalData(currentDataId);
- if (localData == null) {
- return;
- }
- mDataAdapter.refresh(getContentResolver(), localData.getContentUri());
}
@Override