aboutsummaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2014-06-26 20:32:21 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-06-26 20:32:21 +0000
commitef21fba78fce80faf2ab617a230491d2803e6c3c (patch)
treefcb833bec1c70cfb55d174b2a6285c738f59cfe8 /res/values
parent5668c9768f8264663589fd7786d023347b83b0d0 (diff)
parente05316530310250908134aa85b9a5057cacd9543 (diff)
downloadandroid_packages_wallpapers_PhotoPhase-ef21fba78fce80faf2ab617a230491d2803e6c3c.tar.gz
android_packages_wallpapers_PhotoPhase-ef21fba78fce80faf2ab617a230491d2803e6c3c.tar.bz2
android_packages_wallpapers_PhotoPhase-ef21fba78fce80faf2ab617a230491d2803e6c3c.zip
Merge "photophase: adjust number of lines for disposition summary view" into cm-11.0
Diffstat (limited to 'res/values')
-rw-r--r--res/values/integers.xml1
-rw-r--r--res/values/strings.xml2
2 files changed, 1 insertions, 2 deletions
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 879c3e6..b632fcd 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -21,5 +21,4 @@
<integer name="pictures_anim_out">400</integer>
<integer name="disposition_show_anim">800</integer>
<integer name="disposition_hide_anim">400</integer>
- <integer name="disposition_advise_lines">2</integer>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d49a9e3..a63963c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -92,7 +92,7 @@
<string name="pref_disposition_landscape">Landscape arrangement</string>
<string name="pref_disposition_landscape_summary">Select how pictures are arranged on a landscape screen</string>
<!-- [2 lines one for describe long tap and another for describe swipe] -->
- <string name="pref_disposition_description">Long tap a frame and drag \u0026 drop its borders.\nSwipe left and right to show defined templates</string>
+ <string name="pref_disposition_description">Long tap a frame and drag \u0026 drop its borders. Swipe left and right to show defined templates</string>
<string name="pref_disposition_template">Template <xliff:g id="number_of_template">%1$s</xliff:g> of <xliff:g id="total_of_templates">%2$s</xliff:g></string>
<string name="pref_disposition_unable_delete_advise">Unable to delete the selected frame</string>