diff options
author | Andrew Sapperstein <asapperstein@google.com> | 2012-07-27 18:13:51 -0700 |
---|---|---|
committer | Andrew Sapperstein <asapperstein@google.com> | 2012-07-27 18:13:51 -0700 |
commit | 9a7b600e8bd26ed0a0095f62fb405e67d2f47834 (patch) | |
tree | 3de4bbc27f21fb1d0c0e5a0dd1b932d65cdc786c /photoviewer/src | |
parent | 8085e1fcda882074ed387d3e999c448a84d6eb3b (diff) | |
download | android_frameworks_ex-9a7b600e8bd26ed0a0095f62fb405e67d2f47834.tar.gz android_frameworks_ex-9a7b600e8bd26ed0a0095f62fb405e67d2f47834.tar.bz2 android_frameworks_ex-9a7b600e8bd26ed0a0095f62fb405e67d2f47834.zip |
Fixes a bug where scaling would not be performed.
Had to add an additional case to the page transform
that handles the new issue where the just disappeared
view is actually behind the screen but still getting
touch events. Victory.
Change-Id: Ifb760fd7d7510fec37c4101d448dbc980575b1be
Diffstat (limited to 'photoviewer/src')
-rw-r--r-- | photoviewer/src/com/android/ex/photo/PhotoViewPager.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/photoviewer/src/com/android/ex/photo/PhotoViewPager.java b/photoviewer/src/com/android/ex/photo/PhotoViewPager.java index 5945239..65d1d6d 100644 --- a/photoviewer/src/com/android/ex/photo/PhotoViewPager.java +++ b/photoviewer/src/com/android/ex/photo/PhotoViewPager.java @@ -78,7 +78,16 @@ public class PhotoViewPager extends ViewPager { setPageTransformer(true, new PageTransformer() { @Override public void transformPage(View page, float position) { - if (position < 0) { + + // The >= 1 is needed so that the page + // (page A) that transitions behind the newly visible + // page (page B) that comes in from the left does not + // get the touch events because it is still on screen + // (page A is still technically on screen despite being + // invisible). This makes sure that when the transition + // has completely finished, we revert it to its default + // behavior and move it off of the screen. + if (position < 0 || position >= 1.f) { page.setTranslationX(0); page.setAlpha(1.f); page.setScaleX(1); |