aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2014-09-01 20:02:54 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-09-01 20:02:54 +0000
commitcd21e27153c81952b8499447875db8c73a63a536 (patch)
treea82547ec62b877eff65f076d1b5aaf2c74062ae8 /res
parent83a0f2a89ebb8f37d71251d38e013b9f680b90ca (diff)
parentfafd2e1e2cb8f3839740ac42e657875b036806e3 (diff)
downloadandroid_packages_wallpapers_PhotoPhase-cd21e27153c81952b8499447875db8c73a63a536.tar.gz
android_packages_wallpapers_PhotoPhase-cd21e27153c81952b8499447875db8c73a63a536.tar.bz2
android_packages_wallpapers_PhotoPhase-cd21e27153c81952b8499447875db8c73a63a536.zip
Merge "photophase: allow to choose more than one minute for transition timers" into cm-11.0
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index df43a31..9ab1b17 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -86,6 +86,13 @@
<item>15000</item>
<item>30000</item>
<item>60000</item>
+ <item>120000</item>
+ <item>240000</item>
+ <item>300000</item>
+ <item>600000</item>
+ <item>1800000</item>
+ <item>3600000</item>
+ <item>86400000</item>
</integer-array>
<string-array name="effects_labels" translatable="false">