diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-09-14 16:37:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-14 16:37:07 -0700 |
| commit | ccc10bb25616e2b4619c15a0fe22eb8538174062 (patch) | |
| tree | 602a7b271abfe39b3d8500de70c01b7012b82e07 /res/values | |
| parent | 7debfb4ae64e710e2bea5ba2446407c29952b107 (diff) | |
| parent | 15d9a599aa3d354a89c7dcac7f03aa458f3a4158 (diff) | |
| download | LegacyCamera-ccc10bb25616e2b4619c15a0fe22eb8538174062.zip LegacyCamera-ccc10bb25616e2b4619c15a0fe22eb8538174062.tar.gz LegacyCamera-ccc10bb25616e2b4619c15a0fe22eb8538174062.tar.bz2 | |
Merge "Fix effect selection is not reset in setting popup."
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 84053cf..868c926 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -255,7 +255,7 @@ </string-array> <string-array name="pref_video_effect_entryvalues" translatable="false"> - <item>none</item> + <item>@string/pref_video_effect_default</item> <item>goofy_face/squeeze</item> <item>goofy_face/big_eyes</item> <item>goofy_face/big_mouth</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 3b2e2a1..a62a73f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -287,7 +287,7 @@ <string name="tap_to_focus">Tap to focus</string> <!-- Default effect setting that clears the effect. --> - <string name="pref_video_effect_default" translatable="false">-1</string> + <string name="pref_video_effect_default" translatable="false">none</string> <!-- Title of video effect setting popup window --> <string name="pref_video_effect_title">Effects</string> |