summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2012-01-08 16:53:46 +0000
committernebkat <nebkat@teamhacksung.org>2012-01-14 20:33:56 +0000
commit69fcc9d5bd25f1365d787da1594e977016d03c95 (patch)
tree05638d244205e70a654d05ffff75c545c517c927 /res/values
parenta343ae62749f0521f5df6c62370aad26417d473d (diff)
downloadandroid_packages_apps_Trebuchet-69fcc9d5bd25f1365d787da1594e977016d03c95.tar.gz
android_packages_apps_Trebuchet-69fcc9d5bd25f1365d787da1594e977016d03c95.tar.bz2
android_packages_apps_Trebuchet-69fcc9d5bd25f1365d787da1594e977016d03c95.zip
Preferences: Transition Effect (Workspace)
Change-Id: I420b557378f6331f2c5c03de20e9de20395f8175
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml26
-rw-r--r--res/values/config.xml6
-rw-r--r--res/values/strings.xml4
3 files changed, 34 insertions, 2 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
new file mode 100644
index 000000000..cf34b7036
--- /dev/null
+++ b/res/values/arrays.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2008 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array name="preferences_interface_homescreen_scrolling_transition_effect_entries">
+ <item>Standard</item>
+ <item>Tablet</item>
+ <item>Stack</item>
+ </string-array>
+</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index d0ff5ed1a..1a92b4716 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -44,8 +44,10 @@
<!-- Workspace -->
<!-- Whether or not the drop targets drop down as opposed to fade in -->
<bool name="config_useDropTargetDownTransition">true</bool>
- <!-- Whether or not to fade the side pages -->
- <bool name="config_workspaceFadeAdjacentScreens">false</bool>
+ <!-- Which default transition effect to use on the workspace -->
+ <string name="config_workspaceDefaultTransitionEffect">Standard</string>
+ <!-- Whether to fade the adjacent screens when scrolling -->
+ <bool name="config_workspaceDefualtFadeInAdjacentScreens">false</bool>
<!-- The transition duration for the background of the drop targets -->
<integer name="config_dropTargetBgTransitionDuration">100</integer>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 19a08435c..35f0f02d8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -292,6 +292,10 @@ s -->
<string name="preferences_interface_homescreen_general_resize_any_widget_title">Resize any widget</string>
<string name="preferences_interface_homescreen_general_resize_any_widget_summary">Allow resizing of widgets that normally aren\'t resizeable</string>
<string name="preferences_interface_homescreen_scrolling_category">Scrolling</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Transition Effect</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Scrolling effect when scrolling homescreens</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Fade Side Pages</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Fade the side pages when scrolling homescreens</string>
<string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Scroll Wallpaper</string>
<string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Scroll wallpaper when scrolling homescreens</string>
<string name="preferences_interface_homescreen_indicator_category">Indicator</string>