diff options
| author | I-Jong Lin <ijonglin@google.com> | 2015-06-08 21:30:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-08 21:30:39 +0000 |
| commit | d2ba8c6463f6c4213b3202732e10442951228450 (patch) | |
| tree | aa72b631b64b6014565cbf113fba61eb733ba757 | |
| parent | 5890872722491fe9f6fadc5a333609c63b0803b6 (diff) | |
| parent | 5b76be0d5896711d4d8b08a23c8f86bc48583d2e (diff) | |
| download | android_packages_apps_Camera2-d2ba8c6463f6c4213b3202732e10442951228450.tar.gz android_packages_apps_Camera2-d2ba8c6463f6c4213b3202732e10442951228450.tar.bz2 android_packages_apps_Camera2-d2ba8c6463f6c4213b3202732e10442951228450.zip | |
am 5b76be0d: am e2323c53: Refresh required for full-screen undo in filmstrip
* commit '5b76be0d5896711d4d8b08a23c8f86bc48583d2e':
Refresh required for full-screen undo in filmstrip
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 7f5b8aa28..b1127c36a 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -156,6 +156,7 @@ import com.bumptech.glide.GlideBuilder; import com.bumptech.glide.MemoryCategory; import com.bumptech.glide.load.DecodeFormat; import com.bumptech.glide.load.engine.executor.FifoPriorityThreadPoolExecutor; + import com.google.common.base.Optional; import com.google.common.logging.eventprotos; import com.google.common.logging.eventprotos.ForegroundEvent.ForegroundSource; @@ -2612,6 +2613,12 @@ public class CameraActivity extends QuickActivity @Override public void onClick(View view) { mDataAdapter.undoDeletion(); + // Fix for b/21666018: When undoing a delete in Fullscreen + // mode, just flip + // back to the filmstrip to force a refresh. + if (mFilmstripController.inFullScreen()) { + mFilmstripController.goToFilmstrip(); + } hideUndoDeletionBar(true); } }); |