Replace slider assets and fix save-share-button height.

1. Use the same slider asset for both fill-light and highlights.
2. Update slider assets and dimensions.
3. Fix save-share-button height didn't fill action-bar.

Change-Id: I6b3a735c8f745084b89b1d6a035c7ed9bd4ff287

21 files changed, 9 insertions, 12 deletions

diff --git a/res/drawable-sw600dp/photoeditor_scale_seekbar_color.png b/res/drawable-sw600dp/photoeditor_scale_seekbar_color.png
new file mode 100644
index 000000000..e9f46e41d
--- /dev/null
+++ b/res/drawable-sw600dp/photoeditor_scale_seekbar_color.png
diff --git a/res/drawable-sw600dp/photoeditor_scale_seekbar_generic.png b/res/drawable-sw600dp/photoeditor_scale_seekbar_generic.png
new file mode 100644
index 000000000..5d9300091
--- /dev/null
+++ b/res/drawable-sw600dp/photoeditor_scale_seekbar_generic.png
diff --git a/res/drawable-sw600dp/photoeditor_scale_seekbar_light.png b/res/drawable-sw600dp/photoeditor_scale_seekbar_light.png
new file mode 100644
index 000000000..bbf2ac897
--- /dev/null
+++ b/res/drawable-sw600dp/photoeditor_scale_seekbar_light.png
diff --git a/res/drawable-sw600dp/photoeditor_scale_seekbar_shadow.png b/res/drawable-sw600dp/photoeditor_scale_seekbar_shadow.png
new file mode 100644
index 000000000..e7d81e957
--- /dev/null
+++ b/res/drawable-sw600dp/photoeditor_scale_seekbar_shadow.png
diff --git a/res/drawable/photoeditor_scale_seekbar_color.9.png b/res/drawable/photoeditor_scale_seekbar_color.9.png
deleted file mode 100644
index d78ff9b3b..000000000
--- a/res/drawable/photoeditor_scale_seekbar_color.9.png
+++ /dev/null
diff --git a/res/drawable/photoeditor_scale_seekbar_color.png b/res/drawable/photoeditor_scale_seekbar_color.png
new file mode 100644
index 000000000..25ec89099
--- /dev/null
+++ b/res/drawable/photoeditor_scale_seekbar_color.png
diff --git a/res/drawable/photoeditor_scale_seekbar_filllight.9.png b/res/drawable/photoeditor_scale_seekbar_filllight.9.png
deleted file mode 100644
index 43acaf343..000000000
--- a/res/drawable/photoeditor_scale_seekbar_filllight.9.png
+++ /dev/null
diff --git a/res/drawable/photoeditor_scale_seekbar_generic.9.png b/res/drawable/photoeditor_scale_seekbar_generic.9.png
deleted file mode 100644
index 3ee3cc7f0..000000000
--- a/res/drawable/photoeditor_scale_seekbar_generic.9.png
+++ /dev/null
diff --git a/res/drawable/photoeditor_scale_seekbar_generic.png b/res/drawable/photoeditor_scale_seekbar_generic.png
new file mode 100644
index 000000000..5b35aea3a
--- /dev/null
+++ b/res/drawable/photoeditor_scale_seekbar_generic.png
diff --git a/res/drawable/photoeditor_scale_seekbar_highlight.9.png b/res/drawable/photoeditor_scale_seekbar_highlight.9.png
deleted file mode 100644
index 70f54b800..000000000
--- a/res/drawable/photoeditor_scale_seekbar_highlight.9.png
+++ /dev/null
diff --git a/res/drawable/photoeditor_scale_seekbar_light.png b/res/drawable/photoeditor_scale_seekbar_light.png
new file mode 100644
index 000000000..5773bd1d5
--- /dev/null
+++ b/res/drawable/photoeditor_scale_seekbar_light.png
diff --git a/res/drawable/photoeditor_scale_seekbar_shadow.9.png b/res/drawable/photoeditor_scale_seekbar_shadow.9.png
deleted file mode 100644
index b17a78522..000000000
--- a/res/drawable/photoeditor_scale_seekbar_shadow.9.png
+++ /dev/null
diff --git a/res/drawable/photoeditor_scale_seekbar_shadow.png b/res/drawable/photoeditor_scale_seekbar_shadow.png
new file mode 100644
index 000000000..e534bce15
--- /dev/null
+++ b/res/drawable/photoeditor_scale_seekbar_shadow.png
diff --git a/res/drawable/photoeditor_seekbar_thumb.png b/res/drawable/photoeditor_seekbar_thumb.png
index 0d452c16d..0d30816f6 100644
--- a/res/drawable/photoeditor_seekbar_thumb.png
+++ b/res/drawable/photoeditor_seekbar_thumb.png
diff --git a/res/layout/photoeditor_actionbar.xml b/res/layout/photoeditor_actionbar.xml
index 40c18d828..2437611a2 100644
--- a/res/layout/photoeditor_actionbar.xml
+++ b/res/layout/photoeditor_actionbar.xml
@@ -48,7 +48,7 @@
         <ViewSwitcher
             android:id="@+id/save_share_buttons"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_height="fill_parent">
             <Button
                 android:id="@+id/save_button"
                 style="@style/TextActionButton"
diff --git a/res/values-sw320dp/photoeditor_dimens.xml b/res/values-sw320dp/photoeditor_dimens.xml
index 09c47adb7..66e9d5ffc 100755
--- a/res/values-sw320dp/photoeditor_dimens.xml
+++ b/res/values-sw320dp/photoeditor_dimens.xml
@@ -28,7 +28,7 @@
     <dimen name="action_button_padding_horizontal">13dp</dimen>
     <dimen name="effect_tool_panel_padding">10dp</dimen>
     <dimen name="seekbar_width">290dp</dimen>
-    <dimen name="seekbar_height">29dp</dimen>
+    <dimen name="seekbar_height">27dp</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 8a4ada137..1162b4571 100755
--- a/res/values-sw600dp/photoeditor_dimens.xml
+++ b/res/values-sw600dp/photoeditor_dimens.xml
@@ -30,7 +30,7 @@
     <dimen name="action_button_padding_horizontal">22dp</dimen>
     <dimen name="effect_tool_panel_padding">13dp</dimen>
     <dimen name="seekbar_width">560dp</dimen>
-    <dimen name="seekbar_height">33dp</dimen>
+    <dimen name="seekbar_height">23dp</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 1bcc28d45..44791d596 100755
--- a/res/values-sw800dp/photoeditor_dimens.xml
+++ b/res/values-sw800dp/photoeditor_dimens.xml
@@ -30,7 +30,7 @@
     <dimen name="action_button_padding_horizontal">28dp</dimen>
     <dimen name="effect_tool_panel_padding">15dp</dimen>
     <dimen name="seekbar_width">560dp</dimen>
-    <dimen name="seekbar_height">35dp</dimen>
+    <dimen name="seekbar_height">23dp</dimen>
     <dimen name="seekbar_margin_bottom">5dp</dimen>
     <dimen name="crop_indicator_size">48dp</dimen>
 </resources>
diff --git a/src/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java b/src/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
index 4bc49c5fe..2c697351d 100644
--- a/src/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
+++ b/src/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
@@ -29,7 +29,7 @@ import com.android.gallery3d.photoeditor.PhotoView;
 public class EffectToolFactory {
 
     public enum ScalePickerType {
-        FILLLIGHT, HIGHLIGHT, SHADOW, COLOR, GENERIC
+        LIGHT, SHADOW, COLOR, GENERIC
     }
 
     private final ViewGroup effectToolPanel;
@@ -59,11 +59,8 @@ public class EffectToolFactory {
 
     private int getScalePickerBackground(ScalePickerType type) {
         switch (type) {
-            case FILLLIGHT:
-                return R.drawable.photoeditor_scale_seekbar_filllight;
-
-            case HIGHLIGHT:
-                return R.drawable.photoeditor_scale_seekbar_highlight;
+            case LIGHT:
+                return R.drawable.photoeditor_scale_seekbar_light;
 
             case SHADOW:
                 return R.drawable.photoeditor_scale_seekbar_shadow;
diff --git a/src/com/android/gallery3d/photoeditor/actions/FillLightAction.java b/src/com/android/gallery3d/photoeditor/actions/FillLightAction.java
index e5a743c00..962486bbf 100644
--- a/src/com/android/gallery3d/photoeditor/actions/FillLightAction.java
+++ b/src/com/android/gallery3d/photoeditor/actions/FillLightAction.java
@@ -38,7 +38,7 @@ public class FillLightAction extends EffectAction {
     public void doBegin() {
         final FillLightFilter filter = new FillLightFilter();
 
-        scalePicker = factory.createScalePicker(EffectToolFactory.ScalePickerType.FILLLIGHT);
+        scalePicker = factory.createScalePicker(EffectToolFactory.ScalePickerType.LIGHT);
         scalePicker.setOnScaleChangeListener(new ScaleSeekBar.OnScaleChangeListener() {
 
             @Override
diff --git a/src/com/android/gallery3d/photoeditor/actions/HighlightAction.java b/src/com/android/gallery3d/photoeditor/actions/HighlightAction.java
index 06feedcb9..cd8f4b278 100644
--- a/src/com/android/gallery3d/photoeditor/actions/HighlightAction.java
+++ b/src/com/android/gallery3d/photoeditor/actions/HighlightAction.java
@@ -38,7 +38,7 @@ public class HighlightAction extends EffectAction {
     public void doBegin() {
         final HighlightFilter filter = new HighlightFilter();
 
-        scalePicker = factory.createScalePicker(EffectToolFactory.ScalePickerType.HIGHLIGHT);
+        scalePicker = factory.createScalePicker(EffectToolFactory.ScalePickerType.LIGHT);
         scalePicker.setOnScaleChangeListener(new ScaleSeekBar.OnScaleChangeListener() {
 
             @Override