From 6ae2ecaf2f767ba908cb8d7ef8be2340603380a7 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Fri, 19 Jul 2013 17:11:31 -0700
Subject: add Grad filter

Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
---
 res/drawable-hdpi/filtershow_button_grad.png  | Bin 0 -> 1984 bytes
 res/drawable-hdpi/ic_grad_add.png             | Bin 0 -> 3821 bytes
 res/drawable-hdpi/ic_grad_del.png             | Bin 0 -> 2508 bytes
 res/drawable-mdpi/filtershow_button_grad.png  | Bin 0 -> 1442 bytes
 res/drawable-mdpi/ic_grad_add.png             | Bin 0 -> 2535 bytes
 res/drawable-mdpi/ic_grad_del.png             | Bin 0 -> 1752 bytes
 res/drawable-xhdpi/filtershow_button_grad.png | Bin 0 -> 2720 bytes
 res/drawable-xhdpi/ic_grad_add.png            | Bin 0 -> 5964 bytes
 res/drawable-xhdpi/ic_grad_del.png            | Bin 0 -> 3313 bytes
 res/drawable/filtershow_grad_button.xml       |  23 ++++++++++++
 res/layout/editor_grad_button.xml             |  48 ++++++++++++++++++++++++++
 res/layout/filtershow_grad_editor.xml         |  29 ++++++++++++++++
 res/menu/filtershow_menu_grad.xml             |  27 +++++++++++++++
 res/values/filtershow_color.xml               |  10 ++++++
 res/values/filtershow_ids.xml                 |   1 +
 res/values/filtershow_strings.xml             |  14 ++++++++
 res/values/filtershow_values.xml              |   7 ++++
 17 files changed, 159 insertions(+)
 create mode 100644 res/drawable-hdpi/filtershow_button_grad.png
 create mode 100644 res/drawable-hdpi/ic_grad_add.png
 create mode 100644 res/drawable-hdpi/ic_grad_del.png
 create mode 100644 res/drawable-mdpi/filtershow_button_grad.png
 create mode 100644 res/drawable-mdpi/ic_grad_add.png
 create mode 100644 res/drawable-mdpi/ic_grad_del.png
 create mode 100644 res/drawable-xhdpi/filtershow_button_grad.png
 create mode 100644 res/drawable-xhdpi/ic_grad_add.png
 create mode 100644 res/drawable-xhdpi/ic_grad_del.png
 create mode 100644 res/drawable/filtershow_grad_button.xml
 create mode 100644 res/layout/editor_grad_button.xml
 create mode 100644 res/layout/filtershow_grad_editor.xml
 create mode 100644 res/menu/filtershow_menu_grad.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/filtershow_button_grad.png b/res/drawable-hdpi/filtershow_button_grad.png
new file mode 100644
index 000000000..01a565d1d
Binary files /dev/null and b/res/drawable-hdpi/filtershow_button_grad.png differ
diff --git a/res/drawable-hdpi/ic_grad_add.png b/res/drawable-hdpi/ic_grad_add.png
new file mode 100644
index 000000000..4e0dc2b7b
Binary files /dev/null and b/res/drawable-hdpi/ic_grad_add.png differ
diff --git a/res/drawable-hdpi/ic_grad_del.png b/res/drawable-hdpi/ic_grad_del.png
new file mode 100644
index 000000000..521541f49
Binary files /dev/null and b/res/drawable-hdpi/ic_grad_del.png differ
diff --git a/res/drawable-mdpi/filtershow_button_grad.png b/res/drawable-mdpi/filtershow_button_grad.png
new file mode 100644
index 000000000..f04af799e
Binary files /dev/null and b/res/drawable-mdpi/filtershow_button_grad.png differ
diff --git a/res/drawable-mdpi/ic_grad_add.png b/res/drawable-mdpi/ic_grad_add.png
new file mode 100644
index 000000000..94657346e
Binary files /dev/null and b/res/drawable-mdpi/ic_grad_add.png differ
diff --git a/res/drawable-mdpi/ic_grad_del.png b/res/drawable-mdpi/ic_grad_del.png
new file mode 100644
index 000000000..b6221e608
Binary files /dev/null and b/res/drawable-mdpi/ic_grad_del.png differ
diff --git a/res/drawable-xhdpi/filtershow_button_grad.png b/res/drawable-xhdpi/filtershow_button_grad.png
new file mode 100644
index 000000000..3feeef69e
Binary files /dev/null and b/res/drawable-xhdpi/filtershow_button_grad.png differ
diff --git a/res/drawable-xhdpi/ic_grad_add.png b/res/drawable-xhdpi/ic_grad_add.png
new file mode 100644
index 000000000..ca7b654b3
Binary files /dev/null and b/res/drawable-xhdpi/ic_grad_add.png differ
diff --git a/res/drawable-xhdpi/ic_grad_del.png b/res/drawable-xhdpi/ic_grad_del.png
new file mode 100644
index 000000000..9dfb392c8
Binary files /dev/null and b/res/drawable-xhdpi/ic_grad_del.png differ
diff --git a/res/drawable/filtershow_grad_button.xml b/res/drawable/filtershow_grad_button.xml
new file mode 100644
index 000000000..4bf84c1e6
--- /dev/null
+++ b/res/drawable/filtershow_grad_button.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="false" android:drawable="@android:color/transparent"  />
+    <item android:state_checked="true" android:drawable="@android:color/holo_blue_light"  />
+
+</selector>
\ No newline at end of file
diff --git a/res/layout/editor_grad_button.xml b/res/layout/editor_grad_button.xml
new file mode 100644
index 000000000..4d1b10b6b
--- /dev/null
+++ b/res/layout/editor_grad_button.xml
@@ -0,0 +1,48 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:layout_alignParentTop="true"
+    android:layout_marginLeft="26dp"
+    android:layout_marginTop="21dp"
+    android:orientation="horizontal" >
+
+  <com.android.gallery3d.filtershow.ui.FramedTextButton
+      android:id="@+id/editorGradButton"
+      android:layout_width="84dip"
+      android:layout_height="84dip"
+      android:layout_gravity="center_vertical|left"
+      android:background="@drawable/filtershow_button_background"
+      android:scaleType="centerInside"
+      android:visibility="visible"
+      android:text="@string/editor_grad_style" />
+
+  <ToggleButton
+      android:id="@+id/editor_grad_new"
+      android:layout_width="84dip"
+      android:layout_height="84dip"
+      android:layout_gravity="center_vertical|left"
+      android:background="@drawable/filtershow_grad_button"
+      android:scaleType="centerInside"
+      android:visibility="visible"
+      android:textOff="@string/editor_grad_new"
+      android:textOn="@string/editor_grad_new" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/filtershow_grad_editor.xml b/res/layout/filtershow_grad_editor.xml
new file mode 100644
index 000000000..6c4721e62
--- /dev/null
+++ b/res/layout/filtershow_grad_editor.xml
@@ -0,0 +1,29 @@
+<?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"
+    android:id="@+id/gradEditor"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1" >
+
+    <com.android.gallery3d.filtershow.imageshow.ImageGrad
+        android:id="@+id/imageShow"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+ </FrameLayout>
\ No newline at end of file
diff --git a/res/menu/filtershow_menu_grad.xml b/res/menu/filtershow_menu_grad.xml
new file mode 100644
index 000000000..1dee7e0b4
--- /dev/null
+++ b/res/menu/filtershow_menu_grad.xml
@@ -0,0 +1,27 @@
+<!--
+     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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+     <item
+          android:id="@+id/editor_grad_brightness"
+          android:title="@string/editor_grad_brightness"/>
+     <item
+          android:id="@+id/editor_grad_saturation"
+          android:title="@string/editor_grad_saturation"/>
+     <item
+          android:id="@+id/editor_grad_contrast"
+          android:title="@string/editor_grad_contrast"/>
+</menu>
diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml
index 927bfa276..d7cf79d70 100644
--- a/res/values/filtershow_color.xml
+++ b/res/values/filtershow_color.xml
@@ -38,4 +38,14 @@
     <color name="filtershow_categoryview_background">#1a1a1a</color>
     <color name="filtershow_categoryview_text">#a7a7a7</color>
     <color name="filtershow_category_selection">#ffffffff</color>
+    <color name="gradcontrol_point_center">#ffffffff</color>
+    <color name="gradcontrol_point_edge">#ffffffff</color>
+    <color name="gradcontrol_graypoint_center">#888888</color>
+    <color name="gradcontrol_graypoint_edge">#BBBBBB</color>
+    <color name="gradcontrol_point_shadow_start">#66000000</color>
+    <color name="gradcontrol_point_shadow_end">#00000000</color>
+    <color name="gradcontrol_line_color">#FFFFFF</color>
+    <color name="gradcontrol_line_shadow">#000000</color>
+
+
 </resources>
\ No newline at end of file
diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml
index 8ac294136..e57a0d559 100644
--- a/res/values/filtershow_ids.xml
+++ b/res/values/filtershow_ids.xml
@@ -47,4 +47,5 @@
     <item type="id" name="editorRotate" />
     <item type="id" name="editorStraighten" />
     <item type="id" name="editorParametric" />
+    <item type="id" name="editorGrad" />
 </resources>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 503ebbb34..a5c3dc8c4 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -160,6 +160,20 @@
     <string name="kmeans">Warhol</string>
     <!--  Label for the image downsampling effect (makes image smaller) [CHAR LIMIT=15] -->
     <string name="downsample">Downsample</string>
+    <!--  Label for the image graduated filter effect  [CHAR LIMIT=15] -->
+    <string name="grad">Graduated</string>
+    <!--  Label for the Brightness effect  [CHAR LIMIT=20] -->
+    <string name="editor_grad_brightness">Brightness</string>
+    <!--  Label for the Contrast filter effect  [CHAR LIMIT=20] -->
+    <string name="editor_grad_contrast">Contrast</string>
+    <!--  Label for the saturation effect  [CHAR LIMIT=20] -->
+    <string name="editor_grad_saturation">Saturation</string>
+
+    <!--  Label for the image graduated filter effect  [CHAR LIMIT=20] -->
+    <string name="editor_grad_style">Style</string>
+    <!--  Label for the image new grad layer  [CHAR LIMIT=20] -->
+    <string name="editor_grad_new">new</string>
+
 
     <!--  Labels for the curves tool -->
 
diff --git a/res/values/filtershow_values.xml b/res/values/filtershow_values.xml
index ac81e6a26..bd1f8904e 100644
--- a/res/values/filtershow_values.xml
+++ b/res/values/filtershow_values.xml
@@ -33,4 +33,11 @@
     <!-- Category Panel Text Size -->
     <dimen name="category_panel_margin">4dip</dimen>
 
+    <!-- Grad filter dot size -->
+    <dimen name="gradcontrol_dot_size">20dip</dimen>
+
+    <!-- Grad filter minimum touch distance -->
+    <dimen name="gradcontrol_min_touch_dist">40dip</dimen>
+
+
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3