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, 72 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java b/src/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
new file mode 100644
index 000000000..9a3d8499a
--- /dev/null
+++ b/src/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
@@ -0,0 +1,72 @@
+/*
+ * 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.app.Dialog;
+import android.view.MotionEvent;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.ProgressBar;
+
+import com.android.gallery3d.R;
+
+/**
+ * Spinner model progress dialog that disables all tools for user interaction after it shows up and
+ * and re-enables them after it dismisses.
+ */
+public class SpinnerProgressDialog extends Dialog {
+
+    private final ViewGroup tools;
+
+    public static SpinnerProgressDialog show(ViewGroup tools) {
+        SpinnerProgressDialog dialog = new SpinnerProgressDialog(tools);
+        dialog.setCancelable(false);
+        dialog.show();
+        return dialog;
+    }
+
+    private SpinnerProgressDialog(ViewGroup tools) {
+        super(tools.getContext(), R.style.SpinnerProgressDialog);
+
+        addContentView(new ProgressBar(tools.getContext()), new LayoutParams(
+                LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+
+        this.tools = tools;
+        enableTools(false);
+    }
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+
+        enableTools(true);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        super.onTouchEvent(event);
+
+        // Pass touch events to tools for killing idle even when the progress dialog is shown.
+        return tools.dispatchTouchEvent(event);
+    }
+
+    private void enableTools(boolean enabled) {
+        for (int i = 0; i < tools.getChildCount(); i++) {
+            tools.getChildAt(i).setEnabled(enabled);
+        }
+    }
+}