diff options
author | Erin Dahlgren <edahlgren@google.com> | 2013-10-09 13:55:08 -0700 |
---|---|---|
committer | Erin Dahlgren <edahlgren@google.com> | 2013-10-09 13:55:08 -0700 |
commit | 39ca527f2647d7af6ae9f326bec1fa627c675989 (patch) | |
tree | a6ee494cefb4a666d26646c791d6e27c30894ae4 /src/com | |
parent | ef4dccf65c1077b8c7f28c26c9c2038c975fd94c (diff) | |
download | android_packages_apps_Snap-39ca527f2647d7af6ae9f326bec1fa627c675989.tar.gz android_packages_apps_Snap-39ca527f2647d7af6ae9f326bec1fa627c675989.tar.bz2 android_packages_apps_Snap-39ca527f2647d7af6ae9f326bec1fa627c675989.zip |
Update bottom edit control for photos inside secure and insecure mode.
Bug: 11067201
Change-Id: I21a775d46c26206e340c830fceafaf52e7a06ac5
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index 7c9a5bab0..b6f83adf1 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -1027,9 +1027,11 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { // We cannot rely on the requestIds to check for data changes, // because an item hands its id to its rightmost neighbor on // deletion. To avoid loading the ImageData, we check if the DataAdapter - // has fewer total items. + // has fewer total items. We don't want to miss setting the controls + // for a photo while we're still in capture mode, so ignore its fixed + // requestId (0). int total = mDataAdapter.getTotalNumber(); - if (!force && mLastTotalNumber == total) { + if (!force && (requestId == 0 || mLastTotalNumber == total)) { return; } mLastTotalNumber = total; |