summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2015-06-29 17:52:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-29 17:52:46 +0000
commit245239baa8ac24036f05716af4b2739b254846f6 (patch)
tree77acd3be6b20e3044a60cba7bc1d86d43ad7349e /src
parent75dcaf3bd47ec093f5805dc422dcdd397d2d0e1a (diff)
parent62240e14e310aa06601b4d069f30c0190e7b5ef3 (diff)
downloadandroid_packages_apps_Camera2-245239baa8ac24036f05716af4b2739b254846f6.tar.gz
android_packages_apps_Camera2-245239baa8ac24036f05716af4b2739b254846f6.tar.bz2
android_packages_apps_Camera2-245239baa8ac24036f05716af4b2739b254846f6.zip
am 62240e14: Merge "Update filmstrip item on metadata update" into ub-camera-haleakala
* commit '62240e14e310aa06601b4d069f30c0190e7b5ef3': Update filmstrip item on metadata update
Diffstat (limited to 'src')
-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;