summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-10-01 18:15:45 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-01 18:15:45 -0700
commit3508b213dbad5dce76a3c57f8f4b76ad4e765b83 (patch)
treef7b2aedad758f8c53f8754af5e5b3d9173d1df98 /src
parent6fd25fd9a457346c8c32e8c4e68c7c491205730b (diff)
downloadandroid_packages_apps_Gallery2-3508b213dbad5dce76a3c57f8f4b76ad4e765b83.tar.gz
android_packages_apps_Gallery2-3508b213dbad5dce76a3c57f8f4b76ad4e765b83.tar.bz2
android_packages_apps_Gallery2-3508b213dbad5dce76a3c57f8f4b76ad4e765b83.zip
Revert "Enable swiping from LightCycle to Gallery"
This reverts commit 6fd25fd9a457346c8c32e8c4e68c7c491205730b Changed mechanism for enabling swipe in LightCycle. Change-Id: I5c9395eb97ee88d015fb3765d0594d92c4ae126d
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/ui/ExtTexture.java5
-rw-r--r--src/com/android/gallery3d/util/TextureBuffer.java49
2 files changed, 0 insertions, 54 deletions
diff --git a/src/com/android/gallery3d/ui/ExtTexture.java b/src/com/android/gallery3d/ui/ExtTexture.java
index 72b214ff4..eac504fe5 100644
--- a/src/com/android/gallery3d/ui/ExtTexture.java
+++ b/src/com/android/gallery3d/ui/ExtTexture.java
@@ -33,11 +33,6 @@ public class ExtTexture extends BasicTexture {
mTarget = target;
}
- public ExtTexture(int target, int width, int height) {
- this(target);
- setSize(width, height);
- }
-
private void uploadToCanvas(GLCanvas canvas) {
GL11 gl = canvas.getGLInstance();
diff --git a/src/com/android/gallery3d/util/TextureBuffer.java b/src/com/android/gallery3d/util/TextureBuffer.java
deleted file mode 100644
index 509433b53..000000000
--- a/src/com/android/gallery3d/util/TextureBuffer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.gallery3d.util;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-/**
- * Keeps a buffer of data as read from a frame buffer. This can be used with
- * glTexSubImage2D to write to a texture.
- */
-public class TextureBuffer {
- private int mWidth;
- private int mHeight;
- private ByteBuffer mBuffer;
-
- public TextureBuffer(int width, int height) {
- mWidth = width;
- mHeight = height;
-
- mBuffer = ByteBuffer.allocateDirect(width * height * 4).order(ByteOrder.nativeOrder());
- }
-
- public int getWidth() {
- return mWidth;
- }
-
- public int getHeight() {
- return mHeight;
- }
-
- public ByteBuffer getBuffer() {
- return mBuffer;
- }
-}