diff options
| author | John Hoford <hoford@google.com> | 2012-10-23 15:59:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 15:59:16 -0700 |
| commit | 05032520adb2905a73e7719fc88bceedb77cc05c (patch) | |
| tree | 4e367a371a302304a7dca3ffcd5c57c42fab3aea | |
| parent | ff4abb9e160ee9cf2b98c2f9fbb4af903ce869c7 (diff) | |
| parent | b502f7fa8250ba1cb2c74726808155a9f347e606 (diff) | |
| download | android_packages_apps_Snap-05032520adb2905a73e7719fc88bceedb77cc05c.tar.gz android_packages_apps_Snap-05032520adb2905a73e7719fc88bceedb77cc05c.tar.bz2 android_packages_apps_Snap-05032520adb2905a73e7719fc88bceedb77cc05c.zip | |
am 67fefdb9: add support for black and white filters, add rotation API to tiny planet
* commit '67fefdb9b77644c955e1c0c5b1fcd51e2374f212':
add support for black and white filters, add rotation API to tiny planet
| -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] --> |