summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorYuli Huang <yuli@google.com>2011-10-06 18:11:50 +0800
committerYuli Huang <yuli@google.com>2011-10-06 18:11:50 +0800
commit8296cb6e9e884a018283f8fe55f08d4f1668cebe (patch)
treebbb2b8d07f692587958c3921867138122824ad5f /res
parent42bd74425f0f9d9a5dad6e8eeb5b2a37aa8f6a8e (diff)
downloadandroid_packages_apps_Snap-8296cb6e9e884a018283f8fe55f08d4f1668cebe.tar.gz
android_packages_apps_Snap-8296cb6e9e884a018283f8fe55f08d4f1668cebe.tar.bz2
android_packages_apps_Snap-8296cb6e9e884a018283f8fe55f08d4f1668cebe.zip
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
Diffstat (limited to 'res')
-rw-r--r--res/drawable-sw600dp/photoeditor_scale_seekbar_color.pngbin0 -> 2623 bytes
-rw-r--r--res/drawable-sw600dp/photoeditor_scale_seekbar_generic.pngbin0 -> 1667 bytes
-rw-r--r--res/drawable-sw600dp/photoeditor_scale_seekbar_light.pngbin0 -> 2064 bytes
-rw-r--r--res/drawable-sw600dp/photoeditor_scale_seekbar_shadow.pngbin0 -> 2193 bytes
-rw-r--r--res/drawable/photoeditor_scale_seekbar_color.9.pngbin1006 -> 0 bytes
-rw-r--r--res/drawable/photoeditor_scale_seekbar_color.pngbin0 -> 1701 bytes
-rw-r--r--res/drawable/photoeditor_scale_seekbar_filllight.9.pngbin846 -> 0 bytes
-rw-r--r--res/drawable/photoeditor_scale_seekbar_generic.9.pngbin1326 -> 0 bytes
-rw-r--r--res/drawable/photoeditor_scale_seekbar_generic.pngbin0 -> 1082 bytes
-rw-r--r--res/drawable/photoeditor_scale_seekbar_highlight.9.pngbin974 -> 0 bytes
-rw-r--r--res/drawable/photoeditor_scale_seekbar_light.pngbin0 -> 1306 bytes
-rw-r--r--res/drawable/photoeditor_scale_seekbar_shadow.9.pngbin806 -> 0 bytes
-rw-r--r--res/drawable/photoeditor_scale_seekbar_shadow.pngbin0 -> 1270 bytes
-rw-r--r--res/drawable/photoeditor_seekbar_thumb.pngbin1181 -> 2632 bytes
-rw-r--r--res/layout/photoeditor_actionbar.xml2
-rwxr-xr-xres/values-sw320dp/photoeditor_dimens.xml2
-rwxr-xr-xres/values-sw600dp/photoeditor_dimens.xml2
-rwxr-xr-xres/values-sw800dp/photoeditor_dimens.xml2
18 files changed, 4 insertions, 4 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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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>