From fd7d6303402f98a5f682d9c0d37889c2948b9c76 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Fri, 1 Feb 2013 13:41:16 -0800
Subject: fix sharpen to work under the new system

Change-Id: I25518a05511c8b2279ba171bc3902e8cb3181c19
---
 res/layout/filtershow_zoom_editor.xml | 46 +++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 res/layout/filtershow_zoom_editor.xml

(limited to 'res/layout/filtershow_zoom_editor.xml')

diff --git a/res/layout/filtershow_zoom_editor.xml b/res/layout/filtershow_zoom_editor.xml
new file mode 100644
index 000000000..edc52e846
--- /dev/null
+++ b/res/layout/filtershow_zoom_editor.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:iconbutton="http://schemas.android.com/apk/res/com.android.gallery3d"
+    android:id="@+id/basicEditor"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1" >
+
+    <com.android.gallery3d.filtershow.imageshow.ImageZoom
+        android:id="@+id/imageZoom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+        <com.android.gallery3d.filtershow.CenteredLinearLayout
+            xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:background="@android:color/transparent"
+            custom:max_width="600dip"
+            android:orientation="vertical">
+
+            <SeekBar
+                android:id="@+id/filterSeekBar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:padding="16dip"/>
+    </com.android.gallery3d.filtershow.CenteredLinearLayout>
+ </FrameLayout>
-- 
cgit v1.2.3


From c96c311aacb2ca7f9123244d3d2bb044e4a4b242 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Wed, 13 Feb 2013 15:52:31 -0800
Subject: get redeye working again

---
 res/layout/filtershow_zoom_editor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/layout/filtershow_zoom_editor.xml')

diff --git a/res/layout/filtershow_zoom_editor.xml b/res/layout/filtershow_zoom_editor.xml
index edc52e846..3ef6f6bf7 100644
--- a/res/layout/filtershow_zoom_editor.xml
+++ b/res/layout/filtershow_zoom_editor.xml
@@ -22,7 +22,7 @@
     android:layout_height="wrap_content"
     android:layout_weight="1" >
 
-    <com.android.gallery3d.filtershow.imageshow.ImageZoom
+    <com.android.gallery3d.filtershow.imageshow.ImageShow
         android:id="@+id/imageZoom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
-- 
cgit v1.2.3


From 7c1bb24f0b7d240acee416dcb222b61830382dc8 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Mon, 11 Mar 2013 11:10:22 -0700
Subject: refactoring to make Editor classes do more

Change-Id: Id0885929cf3a9410bd0e5d3bf96eb99e8c7e1cf9
---
 res/layout/filtershow_zoom_editor.xml | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'res/layout/filtershow_zoom_editor.xml')

diff --git a/res/layout/filtershow_zoom_editor.xml b/res/layout/filtershow_zoom_editor.xml
index 3ef6f6bf7..9813a283d 100644
--- a/res/layout/filtershow_zoom_editor.xml
+++ b/res/layout/filtershow_zoom_editor.xml
@@ -27,20 +27,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-        <com.android.gallery3d.filtershow.CenteredLinearLayout
-            xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|bottom"
-            android:background="@android:color/transparent"
-            custom:max_width="600dip"
-            android:orientation="vertical">
-
-            <SeekBar
-                android:id="@+id/filterSeekBar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:padding="16dip"/>
-    </com.android.gallery3d.filtershow.CenteredLinearLayout>
  </FrameLayout>
-- 
cgit v1.2.3