summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorNebojsa Cvetkovic <nebkat@gmail.com>2014-01-05 23:15:48 +0000
committerDanesh M <daneshm90@gmail.com>2014-01-24 16:25:19 -0800
commit78ffd65b78ce1e7c97fb408091d401aa6dd3193c (patch)
tree743145b03dffc3280bd3db7eaed80574cd49c301 /res/values
parent233a1403274298f510bb57f02ffde54e40d3ec0b (diff)
downloadandroid_packages_apps_Trebuchet-78ffd65b78ce1e7c97fb408091d401aa6dd3193c.tar.gz
android_packages_apps_Trebuchet-78ffd65b78ce1e7c97fb408091d401aa6dd3193c.tar.bz2
android_packages_apps_Trebuchet-78ffd65b78ce1e7c97fb408091d401aa6dd3193c.zip
PagedView: Transition Effects
Change-Id: Ib134705952877165c334181548d577b3dceece68
Diffstat (limited to 'res/values')
-rw-r--r--res/values/cm_arrays.xml33
-rw-r--r--res/values/cm_strings.xml2
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/preferences_defaults.xml2
4 files changed, 38 insertions, 1 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 580e89317..5d614ab2d 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -10,4 +10,37 @@
<item>sans-serif-light</item>
<item>sans-serif-condensed</item>
</string-array>
+
+ <string-array name="transition_effect_entries">
+ <item>None</item>
+ <item>Zoom In</item>
+ <item>Zoom Out</item>
+ <item>Rotate Up</item>
+ <item>Rotate Down</item>
+ <item>Cube In</item>
+ <item>Cube Out</item>
+ <item>Stack</item>
+ <item>Accordion</item>
+ <item>Flip</item>
+ <item>Cylinder In</item>
+ <item>Cylinder Out</item>
+ <item>Carousel</item>
+ <item>Overview</item>
+ </string-array>
+ <string-array name="transition_effect_values">
+ <item>none</item>
+ <item>zoom-in</item>
+ <item>zoom-out</item>
+ <item>rotate-up</item>
+ <item>rotate-down</item>
+ <item>cube-in</item>
+ <item>cube-out</item>
+ <item>stack</item>
+ <item>accordion</item>
+ <item>flip</item>
+ <item>cylinder-in</item>
+ <item>cylinder-out</item>
+ <item>carousel</item>
+ <item>overview</item>
+ </string-array>
</resources> \ No newline at end of file
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 2dc3fa4bc..50b8bad73 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -12,6 +12,8 @@
<string name="filter_button_text">Filter</string>
<!-- Text for default screen button -->
<string name="default_screen_button_text">Default Screen</string>
+ <!-- Text for transition effect button -->
+ <string name="transition_effect_button_text">Scroll Effect</string>
<string name="sort_mode_title">Title</string>
<string name="sort_mode_launch_count">Launch Count</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8176c8192..3b692a1d1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -43,7 +43,7 @@
<dimen name="workspace_spring_loaded_page_spacing">15dp</dimen>
<dimen name="overview_panel_top_padding">20dp</dimen>
<dimen name="overview_panel_bottom_padding">50dp</dimen>
- <dimen name="overview_panel_buttonSpacing">60dp</dimen>
+ <dimen name="overview_panel_button_spacing">30dp</dimen>
<dimen name="overview_mode_page_offset">130dp</dimen>
<!-- QSB -->
diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml
index 9fa44b27e..ebb1650f4 100644
--- a/res/values/preferences_defaults.xml
+++ b/res/values/preferences_defaults.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="preferences_interface_homescreen_search_default">true</bool>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect">none</string>
<bool name="preferences_interface_homescreen_scrolling_wallpaper_scroll_default">true</bool>
<bool name="preferences_interface_homescreen_scrolling_page_outlines_default">@bool/config_workspaceDefaultShowOutlines</bool>
+ <string name="preferences_interface_drawer_scrolling_transition_effect">stack</string>
<bool name="preferences_interface_general_icons_large_default">@bool/config_largeIcons</bool>
<string name="preferences_interface_general_icons_text_font_family_default">sans-serif-condensed</string>
<integer name="preferences_interface_general_icons_text_font_style_default">0</integer>