summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-05-16 14:32:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-16 14:32:55 -0700
commitbef4722a7567535eb5f7e9cf886de5baa61959ef (patch)
treea94cbcf6abfed6f35c741b6a4a9724dc6d1df1cb
parent4b1faeb1c04e7d1096b821c8cd0397695ac209fd (diff)
parent5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca (diff)
downloadandroid_packages_apps_Gallery2-bef4722a7567535eb5f7e9cf886de5baa61959ef.tar.gz
android_packages_apps_Gallery2-bef4722a7567535eb5f7e9cf886de5baa61959ef.tar.bz2
android_packages_apps_Gallery2-bef4722a7567535eb5f7e9cf886de5baa61959ef.zip
am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce
* commit '5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca': Add new overlay icons for sharpen and curves
-rw-r--r--res/drawable-hdpi/filtershow_button_colors_curve.pngbin1785 -> 1568 bytes
-rw-r--r--res/drawable-hdpi/filtershow_button_colors_sharpen.pngbin0 -> 726 bytes
-rw-r--r--res/drawable-mdpi/filtershow_button_colors_curve.pngbin1232 -> 1139 bytes
-rw-r--r--res/drawable-mdpi/filtershow_button_colors_sharpen.pngbin0 -> 732 bytes
-rw-r--r--res/drawable-xhdpi/filtershow_button_colors_curve.pngbin2297 -> 2047 bytes
-rw-r--r--res/drawable-xhdpi/filtershow_button_colors_sharpen.pngbin0 -> 818 bytes
-rw-r--r--res/drawable/filtershow_button_colors_curve.pngbin1574 -> 0 bytes
-rw-r--r--res/drawable/filtershow_button_colors_sharpen.pngbin1378 -> 0 bytes
8 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable-hdpi/filtershow_button_colors_curve.png b/res/drawable-hdpi/filtershow_button_colors_curve.png
index 0b7a26060..cc33bf84d 100644
--- a/res/drawable-hdpi/filtershow_button_colors_curve.png
+++ b/res/drawable-hdpi/filtershow_button_colors_curve.png
Binary files differ
diff --git a/res/drawable-hdpi/filtershow_button_colors_sharpen.png b/res/drawable-hdpi/filtershow_button_colors_sharpen.png
new file mode 100644
index 000000000..2835b9589
--- /dev/null
+++ b/res/drawable-hdpi/filtershow_button_colors_sharpen.png
Binary files differ
diff --git a/res/drawable-mdpi/filtershow_button_colors_curve.png b/res/drawable-mdpi/filtershow_button_colors_curve.png
index e339d444a..75e7c115e 100644
--- a/res/drawable-mdpi/filtershow_button_colors_curve.png
+++ b/res/drawable-mdpi/filtershow_button_colors_curve.png
Binary files differ
diff --git a/res/drawable-mdpi/filtershow_button_colors_sharpen.png b/res/drawable-mdpi/filtershow_button_colors_sharpen.png
new file mode 100644
index 000000000..9b7152dc8
--- /dev/null
+++ b/res/drawable-mdpi/filtershow_button_colors_sharpen.png
Binary files differ
diff --git a/res/drawable-xhdpi/filtershow_button_colors_curve.png b/res/drawable-xhdpi/filtershow_button_colors_curve.png
index 8ab69aed4..7d80a5922 100644
--- a/res/drawable-xhdpi/filtershow_button_colors_curve.png
+++ b/res/drawable-xhdpi/filtershow_button_colors_curve.png
Binary files differ
diff --git a/res/drawable-xhdpi/filtershow_button_colors_sharpen.png b/res/drawable-xhdpi/filtershow_button_colors_sharpen.png
new file mode 100644
index 000000000..951de4e10
--- /dev/null
+++ b/res/drawable-xhdpi/filtershow_button_colors_sharpen.png
Binary files differ
diff --git a/res/drawable/filtershow_button_colors_curve.png b/res/drawable/filtershow_button_colors_curve.png
deleted file mode 100644
index 7046bd8dd..000000000
--- a/res/drawable/filtershow_button_colors_curve.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/filtershow_button_colors_sharpen.png b/res/drawable/filtershow_button_colors_sharpen.png
deleted file mode 100644
index 2bd0fff6d..000000000
--- a/res/drawable/filtershow_button_colors_sharpen.png
+++ /dev/null
Binary files differ