aboutsummaryrefslogtreecommitdiffstats
path: root/src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2013-08-04 18:49:03 +0200
committerJorge Ruesga <jorge@ruesga.com>2013-08-04 18:49:03 +0200
commit724e4ae4d237c81385e9d0b6b242d1fa3124127a (patch)
tree8fbdbf3b575597e8c1e5251acd702002a88c02e9 /src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java
parent9a4d4f244d9e2d24295bf89c2bbb01610aa33899 (diff)
downloadandroid_packages_wallpapers_PhotoPhase-724e4ae4d237c81385e9d0b6b242d1fa3124127a.tar.gz
android_packages_wallpapers_PhotoPhase-724e4ae4d237c81385e9d0b6b242d1fa3124127a.tar.bz2
android_packages_wallpapers_PhotoPhase-724e4ae4d237c81385e9d0b6b242d1fa3124127a.zip
Touch actions (#5)
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Diffstat (limited to 'src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java')
-rw-r--r--src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java
index 26ba641..3cac77f 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java
@@ -17,7 +17,6 @@
package org.cyanogenmod.wallpapers.photophase;
import android.content.Context;
-import android.graphics.Bitmap;
import android.opengl.GLES20;
import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLColor;
@@ -126,7 +125,6 @@ public class PhotoFrame implements TextureRequestor {
}
// Full frame picture
- // TODO Apply some type of ratio correction to the texture coordinates
setTextureHandle(ti, DEFAULT_TEXTURE_COORDS);
mLoaded = true;
}
@@ -217,15 +215,12 @@ public class PhotoFrame implements TextureRequestor {
}
/**
- * Method that returns the bitmap handle
+ * Method that returns the texture info
*
- * @return int The bitmap handle
+ * @return GLESTextureInfo The texture info
*/
- public Bitmap getTextureBitmap() {
- if (mTextureInfo != null) {
- return mTextureInfo.bitmap;
- }
- return null;
+ public GLESTextureInfo getTextureInfo() {
+ return mTextureInfo;
}
/**