diff options
| author | Alan Newberger <alann@google.com> | 2015-02-04 01:44:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-04 01:44:05 +0000 |
| commit | 983fbebe0cbcedb6e4515f4240ec2d6034e4a7d9 (patch) | |
| tree | 6538b45ca0212d5745a0fc7b506b579ce67a1fb2 /src/com/android/camera/widget | |
| parent | 2eb1f8531b4879b836206cbde0e57335e300b445 (diff) | |
| parent | 34ac66e6d0bb849fb24a6255328390aba204abe3 (diff) | |
| download | android_packages_apps_Camera2-983fbebe0cbcedb6e4515f4240ec2d6034e4a7d9.tar.gz android_packages_apps_Camera2-983fbebe0cbcedb6e4515f4240ec2d6034e4a7d9.tar.bz2 android_packages_apps_Camera2-983fbebe0cbcedb6e4515f4240ec2d6034e4a7d9.zip | |
Merge "Ensure right non-neighbors are invisible during filmstrip item scaling" into ub-camera-haleakala
Diffstat (limited to 'src/com/android/camera/widget')
| -rw-r--r-- | src/com/android/camera/widget/FilmstripView.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/camera/widget/FilmstripView.java b/src/com/android/camera/widget/FilmstripView.java index f910b16e0..0d3cee495 100644 --- a/src/com/android/camera/widget/FilmstripView.java +++ b/src/com/android/camera/widget/FilmstripView.java @@ -1286,19 +1286,27 @@ public class FilmstripView extends ViewGroup { // It's in full-screen mode. fadeAndScaleRightViewItem(i); } else { - boolean setToVisible = (curr.getVisibility() == INVISIBLE); + boolean isVisible = (curr.getVisibility() == VISIBLE); + boolean setToVisible = !isVisible; if (i == BUFFER_CENTER + 1) { + // right hand neighbor needs to fade based on scale of + // center curr.setAlpha(1f - scaleFraction); } else { if (scaleFraction == 0f) { curr.setAlpha(1f); } else { + // further right items should not display when center + // is being scaled setToVisible = false; + if (isVisible) { + curr.setVisibility(INVISIBLE); + } } } - if (setToVisible) { + if (setToVisible && !isVisible) { curr.setVisibility(VISIBLE); } |