diff options
| author | Zhang Zhenzhen <zhangzz6687@thundersoft.com> | 2015-03-10 16:40:13 +0800 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2015-03-18 22:18:11 -0700 |
| commit | 38478f2cfc651b58dd88274c9a3bb7526c91116b (patch) | |
| tree | 2d38112715d53f79e75015ebd985f283affe99f5 /res/values | |
| parent | d51734fb007055835d706170650aa6765ac32899 (diff) | |
| download | android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.tar.gz android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.tar.bz2 android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.zip | |
Modify:Gallery2 for branch Gallery2
Conflicts:
res/values-zh-rCN/strings.xml
res/values/strings.xml
Change-Id: I6b760469290ca154f223f94a3c284fca7a513121
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/filtershow_ids.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml index 460da61aa..58f16dcd1 100644 --- a/res/values/filtershow_ids.xml +++ b/res/values/filtershow_ids.xml @@ -50,4 +50,5 @@ <item type="id" name="editorParametric" /> <item type="id" name="editorGrad" /> <item type="id" name="editorChanSat" /> + <item type="id" name="editorMakeup" /> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 82b286b32..c7ce4d517 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1152,4 +1152,9 @@ CHAR LIMIT = NONE] --> <string name="drm_license_info">Drm license info</string> <string name="mimetype_not_supported">This file can not be played</string> <string name="action_consumes_rights">Rights will be consumed for playing this media</string> + <string name="text_makeup_whiten">Whiten</string> + <string name="text_makeup_Soften">Soften</string> + <string name="text_makeup_trimface">Trimface</string> + <string name="text_makeup_bigeye">Bigeye</string> + </resources> |