Fix b/5375999: replace effect thumbnails.

1. Replace Doodle/Facelift thumbnails.
2. Adjust effect label margins.
3. Remove unused imports from FaceliftFilter.java.

Change-Id: I9e5f162721455ace62bb30d90301a9c70ff95fdc

diff --git a/res/drawable/photoeditor_effect_doodle.png b/res/drawable/photoeditor_effect_doodle.png
index b7e6e91..d23041f 100644 (file)
Binary files a/res/drawable/photoeditor_effect_doodle.png and b/res/drawable/photoeditor_effect_doodle.png differ

diff --git a/res/drawable/photoeditor_effect_facelift.png b/res/drawable/photoeditor_effect_facelift.png
index ba845b5..3e86c1f 100644 (file)
Binary files a/res/drawable/photoeditor_effect_facelift.png and b/res/drawable/photoeditor_effect_facelift.png differ

diff --git a/res/values-sw320dp/photoeditor_dimens.xml b/res/values-sw320dp/photoeditor_dimens.xml
index 5d894a6..09c47ad 100755 (executable)
--- a/res/values-sw320dp/photoeditor_dimens.xml
+++ b/res/values-sw320dp/photoeditor_dimens.xml
@@ -15,19 +15,20 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <dimen name="effect_label_text_size">11sp</dimen>
-    <dimen name="effect_label_width">98dp</dimen>
+    <dimen name="effect_label_text_size">11.5sp</dimen>
+    <dimen name="effect_label_width">100dp</dimen>
+    <dimen name="effect_label_margin_top">3dp</dimen>
     <dimen name="effect_icon_size">72dp</dimen>
-    <dimen name="effect_padding_horizontal">2dp</dimen>
-    <dimen name="effects_container_padding">12dp</dimen>
+    <dimen name="effect_padding_horizontal">1dp</dimen>
+    <dimen name="effects_container_padding">8dp</dimen>
     <dimen name="action_bar_arrow_margin_left">3dp</dimen>
     <dimen name="action_bar_arrow_margin_right">-3dp</dimen>
     <dimen name="action_bar_icon_padding_left">0dp</dimen>
     <dimen name="action_bar_icon_padding_right">5dp</dimen>
     <dimen name="action_button_padding_horizontal">13dp</dimen>
-    <dimen name="effect_tool_panel_padding">12dp</dimen>
+    <dimen name="effect_tool_panel_padding">10dp</dimen>
     <dimen name="seekbar_width">290dp</dimen>
     <dimen name="seekbar_height">29dp</dimen>
-    <dimen name="seekbar_margin_bottom">6dp</dimen>
+    <dimen name="seekbar_margin_bottom">3dp</dimen>
     <dimen name="crop_indicator_size">35dp</dimen>
 </resources>

diff --git a/res/values-sw600dp/photoeditor_dimens.xml b/res/values-sw600dp/photoeditor_dimens.xml
index 2b9cf6f..8a4ada1 100755 (executable)
--- a/res/values-sw600dp/photoeditor_dimens.xml
+++ b/res/values-sw600dp/photoeditor_dimens.xml
@@ -15,11 +15,12 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <dimen name="effect_label_text_size">14sp</dimen>
+    <dimen name="effect_label_text_size">13.5sp</dimen>
     <dimen name="effect_label_width">120dp</dimen>
+    <dimen name="effect_label_margin_top">3dp</dimen>
     <dimen name="effect_icon_size">90dp</dimen>
     <dimen name="effect_padding_horizontal">2dp</dimen>
-    <dimen name="effects_container_padding">12dp</dimen>
+    <dimen name="effects_container_padding">11dp</dimen>
     <dimen name="action_bar_arrow_margin_left">3dp</dimen>
     <dimen name="action_bar_arrow_margin_right">-3dp</dimen>
     <dimen name="action_bar_icon_padding_vertical">4dp</dimen>
@@ -27,9 +28,9 @@
     <dimen name="action_bar_icon_padding_right">5dp</dimen>
     <dimen name="action_button_padding_vertical">8dp</dimen>
     <dimen name="action_button_padding_horizontal">22dp</dimen>
-    <dimen name="effect_tool_panel_padding">16dp</dimen>
+    <dimen name="effect_tool_panel_padding">13dp</dimen>
     <dimen name="seekbar_width">560dp</dimen>
     <dimen name="seekbar_height">33dp</dimen>
-    <dimen name="seekbar_margin_bottom">8dp</dimen>
+    <dimen name="seekbar_margin_bottom">4dp</dimen>
     <dimen name="crop_indicator_size">43dp</dimen>
 </resources>

diff --git a/res/values-sw800dp/photoeditor_dimens.xml b/res/values-sw800dp/photoeditor_dimens.xml
index 9dab922..1bcc28d 100755 (executable)
--- a/res/values-sw800dp/photoeditor_dimens.xml
+++ b/res/values-sw800dp/photoeditor_dimens.xml
@@ -15,11 +15,12 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <dimen name="effect_label_text_size">15sp</dimen>
-    <dimen name="effect_label_width">138dp</dimen>
+    <dimen name="effect_label_text_size">14.5sp</dimen>
+    <dimen name="effect_label_width">140dp</dimen>
+    <dimen name="effect_label_margin_top">4dp</dimen>
     <dimen name="effect_icon_size">100dp</dimen>
-    <dimen name="effect_padding_horizontal">3dp</dimen>
-    <dimen name="effects_container_padding">18dp</dimen>
+    <dimen name="effect_padding_horizontal">2dp</dimen>
+    <dimen name="effects_container_padding">13dp</dimen>
     <dimen name="action_bar_arrow_margin_left">3dp</dimen>
     <dimen name="action_bar_arrow_margin_right">-3dp</dimen>
     <dimen name="action_bar_icon_padding_vertical">4dp</dimen>
@@ -27,9 +28,9 @@
     <dimen name="action_bar_icon_padding_right">5dp</dimen>
     <dimen name="action_button_padding_vertical">8dp</dimen>
     <dimen name="action_button_padding_horizontal">28dp</dimen>
-    <dimen name="effect_tool_panel_padding">18dp</dimen>
+    <dimen name="effect_tool_panel_padding">15dp</dimen>
     <dimen name="seekbar_width">560dp</dimen>
     <dimen name="seekbar_height">35dp</dimen>
-    <dimen name="seekbar_margin_bottom">9dp</dimen>
+    <dimen name="seekbar_margin_bottom">5dp</dimen>
     <dimen name="crop_indicator_size">48dp</dimen>
 </resources>

diff --git a/res/values/photoeditor_styles.xml b/res/values/photoeditor_styles.xml
index fe5ad1a..964ecbf 100644 (file)
--- a/res/values/photoeditor_styles.xml
+++ b/res/values/photoeditor_styles.xml
@@ -26,6 +26,7 @@
         <item name="android:layout_width">@dimen/effect_label_width</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_marginTop">@dimen/effect_label_margin_top</item>
         <item name="android:gravity">center</item>
         <item name="android:textSize">@dimen/effect_label_text_size</item>
         <item name="android:textColor">#FFFFFF</item>

diff --git a/src/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java b/src/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
index 3fa2e31..3bbbfa1 100644 (file)
--- a/src/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
+++ b/src/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
@@ -18,7 +18,6 @@ package com.android.gallery3d.photoeditor.filters;
 
 import android.media.effect.Effect;
 import android.media.effect.EffectContext;
-import android.media.effect.EffectFactory;
 
 import com.android.gallery3d.photoeditor.Photo;