diff options
author | John Hoford <hoford@google.com> | 2013-08-02 00:49:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-02 00:49:20 +0000 |
commit | a1168a948830022c599a6164d92ce537794a1247 (patch) | |
tree | 8a7fcc5714420127e5b7aec76cf29675393980a9 /res | |
parent | 8bd17465ed2058eee581fdf8e6c401796692161c (diff) | |
parent | 2f1ff6df511486b307ea8facbea8656015c93c20 (diff) | |
download | android_packages_apps_Snap-a1168a948830022c599a6164d92ce537794a1247.tar.gz android_packages_apps_Snap-a1168a948830022c599a6164d92ce537794a1247.tar.bz2 android_packages_apps_Snap-a1168a948830022c599a6164d92ce537794a1247.zip |
Merge "add Per Channel Saturation" into gb-ub-photos-carlsbad
Diffstat (limited to 'res')
-rw-r--r-- | res/menu/filtershow_menu_chan_sat.xml | 43 | ||||
-rw-r--r-- | res/values/filtershow_ids.xml | 1 | ||||
-rw-r--r-- | res/values/filtershow_strings.xml | 15 |
3 files changed, 58 insertions, 1 deletions
diff --git a/res/menu/filtershow_menu_chan_sat.xml b/res/menu/filtershow_menu_chan_sat.xml new file mode 100644 index 000000000..eae559d41 --- /dev/null +++ b/res/menu/filtershow_menu_chan_sat.xml @@ -0,0 +1,43 @@ +<!-- + Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <group android:id="@+id/grunge_popupmenu" > + <item + android:id="@+id/editor_chan_sat_main" + android:title="@string/editor_chan_sat_main"/> + <item + android:id="@+id/editor_chan_sat_red" + android:title="@string/editor_chan_sat_red"/> + <item + android:id="@+id/editor_chan_sat_yellow" + android:title="@string/editor_chan_sat_yellow"/> + <item + android:id="@+id/editor_chan_sat_green" + android:title="@string/editor_chan_sat_green"/> + <item + android:id="@+id/editor_chan_sat_cyan" + android:title="@string/editor_chan_sat_cyan"/> + <item + android:id="@+id/editor_chan_sat_blue" + android:title="@string/editor_chan_sat_blue"/> + <item + android:id="@+id/editor_chan_sat_magenta" + android:title="@string/editor_chan_sat_magenta"/> + </group> + +</menu>
\ No newline at end of file diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml index e57a0d559..b315d12d9 100644 --- a/res/values/filtershow_ids.xml +++ b/res/values/filtershow_ids.xml @@ -48,4 +48,5 @@ <item type="id" name="editorStraighten" /> <item type="id" name="editorParametric" /> <item type="id" name="editorGrad" /> + <item type="id" name="editorChanSat" /> </resources> diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index a820871c6..68eca34f3 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -168,7 +168,20 @@ <string name="editor_grad_contrast">Contrast</string> <!-- Label for the saturation effect [CHAR LIMIT=20] --> <string name="editor_grad_saturation">Saturation</string> - + <!-- Label for the Main or Master control for per channel saturation effect [CHAR LIMIT=20] --> + <string name="editor_chan_sat_main">Main</string> + <!-- Label for the red control for per channel saturation effect [CHAR LIMIT=20] --> + <string name="editor_chan_sat_red">Red</string> + <!-- Label for the yellow control for per channel saturation effect [CHAR LIMIT=20] --> + <string name="editor_chan_sat_yellow">Yellow</string> + <!-- Label for the green control for per channel saturation effect [CHAR LIMIT=20] --> + <string name="editor_chan_sat_green">Green</string> + <!-- Label for the cyan control for per channel saturation effect [CHAR LIMIT=20] --> + <string name="editor_chan_sat_cyan">Cyan</string> + <!-- Label for the blue control for per channel saturation effect [CHAR LIMIT=20] --> + <string name="editor_chan_sat_blue">Blue</string> + <!-- Label for the Magenta control for per channel saturation effect [CHAR LIMIT=20] --> + <string name="editor_chan_sat_magenta">Magenta</string> <!-- Label for the image graduated filter effect [CHAR LIMIT=20] --> <string name="editor_grad_style">Style</string> <!-- Label for the image new grad layer [CHAR LIMIT=20] --> |