diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-16 17:40:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-16 17:40:58 -0700 |
| commit | 2887cd999249046f70753fdc864e82924f0a2eb8 (patch) | |
| tree | 5a8be3eda0b5bf30e053ae53217c0afa9246ef4c /src | |
| parent | 4f0d6320ccce2f21c81af84dadfd57985789e657 (diff) | |
| parent | 7b5201e92d46cc710ead66c1f899f0f4ab65295a (diff) | |
| download | android_packages_screensavers_PhotoTable-2887cd999249046f70753fdc864e82924f0a2eb8.tar.gz android_packages_screensavers_PhotoTable-2887cd999249046f70753fdc864e82924f0a2eb8.tar.bz2 android_packages_screensavers_PhotoTable-2887cd999249046f70753fdc864e82924f0a2eb8.zip | |
Merge "Save memory" into jb-mr1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dreams/phototable/PhotoTable.java | 2 | ||||
| -rw-r--r-- | src/com/android/dreams/phototable/PhotoTouchListener.java | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/dreams/phototable/PhotoTable.java b/src/com/android/dreams/phototable/PhotoTable.java index 89a669e..49941cd 100644 --- a/src/com/android/dreams/phototable/PhotoTable.java +++ b/src/com/android/dreams/phototable/PhotoTable.java @@ -388,7 +388,6 @@ public class PhotoTable extends FrameLayout { log("animate it"); // toss onto table photo.animate() - .withLayer() .scaleX(mTableRatio / mImageRatio) .scaleY(mTableRatio / mImageRatio) .rotation(angle) @@ -442,7 +441,6 @@ public class PhotoTable extends FrameLayout { log("animate it"); // toss onto table photo.animate() - .withLayer() .rotation(0f) .scaleX(scale) .scaleY(scale) diff --git a/src/com/android/dreams/phototable/PhotoTouchListener.java b/src/com/android/dreams/phototable/PhotoTouchListener.java index 2cfcbd4..8076e72 100644 --- a/src/com/android/dreams/phototable/PhotoTouchListener.java +++ b/src/com/android/dreams/phototable/PhotoTouchListener.java @@ -128,7 +128,6 @@ public class PhotoTouchListener implements View.OnTouchListener { Math.min(photoWidth * mTableRatio, photoHeight * mTableRatio) / 2f; final View photo = target; ViewPropertyAnimator animator = photo.animate() - .withLayer() .xBy(x1 - x0) .yBy(y1 - y0) .setDuration((int) (1000f * n / 60f)) |