Fix b/4643148: Make PhotoEditor integrated into Gallery.

1. Move PhotoEditor code/resources into Gallery for single apk.
2. Change PhotoEditor package to com.android.gallery3d.photoeditor.
3. Rename PhotoEditor resources to avoid mess up Gallery resources.
4. Move Doodle effect from fix-effects to color-effects.
5. Update PhotoEditor bottom action-bar background.

Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4

1 files changed, 161 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/photoeditor/PhotoView.java b/src/com/android/gallery3d/photoeditor/PhotoView.java
new file mode 100644
index 000000000..8c758ddb1
--- /dev/null
+++ b/src/com/android/gallery3d/photoeditor/PhotoView.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2010 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.photoeditor;
+
+import android.content.Context;
+import android.graphics.RectF;
+import android.opengl.GLSurfaceView;
+import android.util.AttributeSet;
+
+import java.util.Vector;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+/**
+ * Renders and displays photo in the surface view.
+ */
+public class PhotoView extends GLSurfaceView {
+
+    private final PhotoRenderer renderer;
+
+    public PhotoView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        renderer = new PhotoRenderer();
+        setEGLContextClientVersion(2);
+        setRenderer(renderer);
+        setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
+    }
+
+    public RectF getPhotoBounds() {
+        RectF photoBounds;
+        synchronized (renderer.photoBounds) {
+            photoBounds = new RectF(renderer.photoBounds);
+        }
+        return photoBounds;
+    }
+
+    /**
+     * Queues a runnable and renders a frame after execution. Queued runnables could be later
+     * removed by remove() or flush().
+     */
+    public void queue(Runnable r) {
+        renderer.queue.add(r);
+        requestRender();
+    }
+
+    /**
+     * Removes the specified queued runnable.
+     */
+    public void remove(Runnable runnable) {
+        renderer.queue.remove(runnable);
+    }
+
+    /**
+     * Flushes all queued runnables to cancel their execution.
+     */
+    public void flush() {
+        renderer.queue.clear();
+    }
+
+    /**
+     * Sets photo for display; this method must be queued for GL thread.
+     */
+    public void setPhoto(Photo photo) {
+        renderer.setPhoto(photo);
+    }
+
+    /**
+     * Rotates displayed photo; this method must be queued for GL thread.
+     */
+    public void rotatePhoto(float degrees) {
+        renderer.rotatePhoto(degrees);
+    }
+
+    /**
+     * Renderer that renders the GL surface-view and only be called from the GL thread.
+     */
+    private class PhotoRenderer implements GLSurfaceView.Renderer {
+
+        final Vector<Runnable> queue = new Vector<Runnable>();
+        final RectF photoBounds = new RectF();
+        RendererUtils.RenderContext renderContext;
+        Photo photo;
+        int viewWidth;
+        int viewHeight;
+
+        void setPhoto(Photo photo) {
+            int width = (photo != null) ? photo.width() : 0;
+            int height = (photo != null) ? photo.height() : 0;
+            synchronized (photoBounds) {
+                photoBounds.set(0, 0, width, height);
+            }
+            this.photo = photo;
+            fitPhotoToSurface();
+        }
+
+        void fitPhotoToSurface() {
+            if (photo != null) {
+                RendererUtils.setRenderToFit(renderContext, photo.width(), photo.height(),
+                        viewWidth, viewHeight);
+            }
+        }
+
+        void rotatePhoto(float degrees) {
+            if (photo != null) {
+                RendererUtils.setRenderToRotate(renderContext, photo.width(), photo.height(),
+                        viewWidth, viewHeight, degrees);
+            }
+        }
+
+        void renderPhoto() {
+            if (photo != null) {
+                RendererUtils.renderTexture(renderContext, photo.texture(), viewWidth, viewHeight);
+            }
+        }
+
+        @Override
+        public void onDrawFrame(GL10 gl) {
+            Runnable r = null;
+            synchronized (queue) {
+                if (!queue.isEmpty()) {
+                    r = queue.remove(0);
+                }
+            }
+            if (r != null) {
+                r.run();
+            }
+            if (!queue.isEmpty()) {
+                requestRender();
+            }
+            renderPhoto();
+        }
+
+        @Override
+        public void onSurfaceChanged(GL10 gl, int width, int height) {
+            viewWidth = width;
+            viewHeight = height;
+            fitPhotoToSurface();
+        }
+
+        @Override
+        public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+            renderContext = RendererUtils.createProgram();
+        }
+    }
+}