am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad

* commit '716860487554b5e214d355f88effc9b8c316d54e':
  Update bottom edit control for photos inside secure and insecure mode.

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;