summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app
diff options
context:
space:
mode:
authorYour Name <jreck@google.com>2012-12-11 17:11:52 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-11 17:11:52 -0800
commit97d9a7cdf25c39b5a4cb92a99ec9fb21d7da1509 (patch)
treeae9fd882d2a87eca729ca7dcddab90ca15d250bc /src/com/android/gallery3d/app
parent8e8cc05541f6c8c34c6c37aa5622e146064a1793 (diff)
parent6c6e2d4edeb0113376b66ac4491ce7ec023e3437 (diff)
downloadandroid_packages_apps_Snap-97d9a7cdf25c39b5a4cb92a99ec9fb21d7da1509.tar.gz
android_packages_apps_Snap-97d9a7cdf25c39b5a4cb92a99ec9fb21d7da1509.tar.bz2
android_packages_apps_Snap-97d9a7cdf25c39b5a4cb92a99ec9fb21d7da1509.zip
Merge "Remove LongSpareArray + some cleanups" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/app')
-rw-r--r--src/com/android/gallery3d/app/PhotoDataAdapter.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/app/PhotoDataAdapter.java b/src/com/android/gallery3d/app/PhotoDataAdapter.java
index c38d25656..2b586da94 100644
--- a/src/com/android/gallery3d/app/PhotoDataAdapter.java
+++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java
@@ -550,9 +550,8 @@ public class PhotoDataAdapter implements PhotoPage.Model {
}
@Override
- public Bitmap getTile(int level, int x, int y, int tileSize,
- int borderSize, BitmapPool pool) {
- return mTileProvider.getTile(level, x, y, tileSize, borderSize, pool);
+ public Bitmap getTile(int level, int x, int y, int tileSize, BitmapPool pool) {
+ return mTileProvider.getTile(level, x, y, tileSize, pool);
}
@Override