diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2011-09-09 12:06:51 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-09 12:06:51 -0700 |
commit | dbba504f8003afdb9cbe1c25239611c1111c5efe (patch) | |
tree | c1c65a5f4cd52ad6da975979b95ae8d7bf9d7fe1 | |
parent | e1178a73fd5756771d25d0b8375452450f509e99 (diff) | |
parent | bd242c048d4c26d516015c79900f47b776348730 (diff) | |
download | LegacyCamera-dbba504f8003afdb9cbe1c25239611c1111c5efe.zip LegacyCamera-dbba504f8003afdb9cbe1c25239611c1111c5efe.tar.gz LegacyCamera-dbba504f8003afdb9cbe1c25239611c1111c5efe.tar.bz2 |
Merge "Update background replacement videos and matching strings."
-rw-r--r-- | res/values/arrays.xml | 6 | ||||
-rw-r--r-- | res/values/strings.xml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 4006a7e..84053cf 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -250,7 +250,7 @@ <item>@string/effect_goofy_face_big_nose</item> <item>@string/effect_goofy_face_small_eyes</item> <item>@string/effect_backdropper_space</item> - <item>@string/effect_backdropper_beach</item> + <item>@string/effect_backdropper_sunset</item> <item>@string/effect_backdropper_gallery</item> </string-array> @@ -262,8 +262,8 @@ <item>goofy_face/small_mouth</item> <item>goofy_face/big_nose</item> <item>goofy_face/small_eyes</item> - <item>backdropper/file:///system/media/video/AndroidinSpace15s100.mp4</item> - <item>backdropper/file:///system/media/video/beach_100k.mp4</item> + <item>backdropper/file:///system/media/video/AndroidInSpace.240p.mp4</item> + <item>backdropper/file:///system/media/video/Sunset.240p.mp4</item> <item>backdropper/gallery</item> </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 8cf4662..268e519 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -306,10 +306,10 @@ <string name="effect_goofy_face_big_nose">Big Nose</string> <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] --> <string name="effect_goofy_face_small_eyes">Small Eyes</string> - <!-- Effect setting item that replaces background with space. [CHAR LIMIT=14] --> + <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] --> <string name="effect_backdropper_space">In Space</string> - <!-- Effect setting item that replaces background with the beach. [CHAR LIMIT=14] --> - <string name="effect_backdropper_beach">On the Beach</string> + <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] --> + <string name="effect_backdropper_sunset">Sunset</string> <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] --> <string name="effect_backdropper_gallery">Pick your own</string> |