summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2012-10-18 00:36:02 -0700
committerSascha Haeberling <haeberling@google.com>2012-10-18 14:29:29 -0700
commit5181cd2335c3ea1998933a94e318ec68b0aa3f12 (patch)
tree4ca4e7497e0b4917af379208c5b631fc2f74d24b /res
parentdbe1085854dcead520f327306c1d4b78880eec9d (diff)
downloadandroid_packages_apps_Snap-5181cd2335c3ea1998933a94e318ec68b0aa3f12.tar.gz
android_packages_apps_Snap-5181cd2335c3ea1998933a94e318ec68b0aa3f12.tar.bz2
android_packages_apps_Snap-5181cd2335c3ea1998933a94e318ec68b0aa3f12.zip
First cut at a skeleton for the TinyPlanets filter.
Bug: 7344426 This is not hooking up the real algorithm yet, but unblocks Doris so she can add the button while we rewrite the algorithm. Change-Id: I685b6c189e8ac124670db53c37565c4f1ff1f606
Diffstat (limited to 'res')
-rw-r--r--res/layout/filtershow_activity.xml5
-rw-r--r--res/values/filtershow_strings.xml2
2 files changed, 7 insertions, 0 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 78fe2d8b6..c62e7142b 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -317,6 +317,11 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/thumbnail_margin"
android:orientation="horizontal" >
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/tinyplanetButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_contrast"
+ android:text="@string/tinyplanet" />
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
android:id="@+id/wbalanceButton"
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index d4d02f597..a312f5afe 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -77,6 +77,8 @@
<string name="aspectNone_effect">None</string>
<!-- Label for the aspect None effect [CHAR LIMIT=15] -->
<string name="aspectOriginal_effect">Original</string>
+ <!-- Label for the tuny planet effect [CHAR LIMIT=10] -->
+ <string name="tinyplanet">Tiny Planet</string>
<!-- Filters buttons -->