diff options
author | John Hoford <hoford@google.com> | 2012-10-23 15:17:12 -0700 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2012-10-23 15:55:48 -0700 |
commit | b502f7fa8250ba1cb2c74726808155a9f347e606 (patch) | |
tree | 757228df27f83103ed5172f2217b3d88a0d1cd73 | |
parent | ae215b531ee64ffec0e3a7b003843360102d5c11 (diff) | |
download | android_packages_apps_Snap-b502f7fa8250ba1cb2c74726808155a9f347e606.tar.gz android_packages_apps_Snap-b502f7fa8250ba1cb2c74726808155a9f347e606.tar.bz2 android_packages_apps_Snap-b502f7fa8250ba1cb2c74726808155a9f347e606.zip |
add support for black and white filters, add rotation API to tiny planet
bug:7386370
bug:7389189
Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
-rw-r--r-- | res/layout/filtershow_activity.xml | 6 | ||||
-rw-r--r-- | res/values/filtershow_strings.xml | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index 6cebb3698..f6900b3c2 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -358,6 +358,12 @@ android:src="@drawable/filtershow_button_colors_contrast" android:text="@string/saturation" /> + <com.android.gallery3d.filtershow.ui.ImageButtonTitle + android:id="@+id/bwfilterButton" + style="@style/FilterShowBottomButton" + android:src="@drawable/filtershow_button_colors_contrast" + android:text="@string/bwfilter" /> + </LinearLayout> </HorizontalScrollView> </FrameLayout> diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 3862865ef..852ef7474 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -103,6 +103,8 @@ <string name="vibrance">Vibrance</string> <!-- Label for the saturation filter button [CHAR LIMIT=15] --> <string name="saturation">Saturation</string> + <!-- Label for the BW filter button [CHAR LIMIT=15] --> + <string name="bwfilter">BW Filter</string> <!-- Label for the White Balance filter button [CHAR LIMIT=15] --> <string name="wbalance">Autocolor</string> <!-- Label for the Hue filter button [CHAR LIMIT=15] --> |