summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2015-06-29 18:00:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-29 18:00:11 +0000
commit6c296b2b15abfb375e14c2cdbe353c28d05b7ae9 (patch)
tree41b28a793807085a2f4a9dca568605318b1747e3
parentdc1a777d0a7e95d461fcc6d9c28a12def38afcb0 (diff)
parent245239baa8ac24036f05716af4b2739b254846f6 (diff)
downloadandroid_packages_apps_Camera2-6c296b2b15abfb375e14c2cdbe353c28d05b7ae9.tar.gz
android_packages_apps_Camera2-6c296b2b15abfb375e14c2cdbe353c28d05b7ae9.tar.bz2
android_packages_apps_Camera2-6c296b2b15abfb375e14c2cdbe353c28d05b7ae9.zip
am 245239ba: am 62240e14: Merge "Update filmstrip item on metadata update" into ub-camera-haleakala
* commit '245239baa8ac24036f05716af4b2739b254846f6': Update filmstrip item on metadata update
-rw-r--r--src/com/android/camera/CameraActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index b1127c36a..a2c49c50b 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -777,7 +777,7 @@ public class CameraActivity extends QuickActivity
int currentIndex = mFilmstripController.getCurrentAdapterIndex();
for (Integer index : indexes) {
if (index == currentIndex) {
- updateBottomControlsByData(mDataAdapter.getItemAt(index));
+ updateUiByData(index);
// Currently we have only 1 data can be matched.
// No need to look for more, break.
break;