diff options
| author | Nebojsa Cvetkovic <nebkat@gmail.com> | 2014-11-10 10:35:00 -0800 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:56 -0800 |
| commit | 3ada0966559cd9fee535a40686e049cd0d6f15c0 (patch) | |
| tree | 0b06557595d3c49e1ff826ffa2053824c3dc2031 /res/values | |
| parent | 0daed36da7dab3172f05aa3dc29b7facac01ce6e (diff) | |
| download | android_packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.tar.gz android_packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.tar.bz2 android_packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.zip | |
PagedView: Transition Effects
Conflicts:
res/layout/overview_panel.xml
res/values/cm_arrays.xml
res/values/cm_strings.xml
res/values/dimens.xml
res/values/preferences_defaults.xml
src/com/android/launcher3/AppsCustomizePagedView.java
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/PagedView.java
src/com/android/launcher3/Workspace.java
src/com/android/launcher3/settings/SettingsProvider.java
Change-Id: Ib134705952877165c334181548d577b3dceece68
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/cm_arrays.xml | 2 | ||||
| -rw-r--r-- | res/values/config.xml | 5 | ||||
| -rw-r--r-- | res/values/preferences_defaults.xml | 15 |
3 files changed, 21 insertions, 1 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index 2320f1805..de89b530b 100644 --- a/res/values/cm_arrays.xml +++ b/res/values/cm_arrays.xml @@ -74,4 +74,4 @@ <item>@drawable/transition_carousel</item> <item>@drawable/transition_overview</item> </string-array> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values/config.xml b/res/values/config.xml index 8e19e3706..52d08718f 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -13,6 +13,7 @@ <bool name="is_tablet">false</bool> <bool name="is_large_tablet">false</bool> <bool name="allow_rotation">false</bool> + <bool name="config_largeIcons">false</bool> <!-- Max number of page indicators to show --> <integer name="config_maxNumberOfPageIndicatorsToShow">21</integer> @@ -64,6 +65,10 @@ <!-- Workspace --> <!-- Whether or not the drop targets drop down as opposed to fade in --> <bool name="config_useDropTargetDownTransition">false</bool> + <!-- Whether or not to fade the side pages --> + <bool name="config_workspaceFadeAdjacentScreens">false</bool> + <!-- Whether to show outlines on the screens when scrolling --> + <bool name="config_workspaceDefaultShowOutlines">false</bool> <!-- The transition duration for the background of the drop targets --> <integer name="config_dropTargetBgTransitionDuration">0</integer> diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml new file mode 100644 index 000000000..6d6d1b29e --- /dev/null +++ b/res/values/preferences_defaults.xml @@ -0,0 +1,15 @@ +<?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> + <bool name="preferences_interface_homescreen_scrolling_fade_adjacent_default">@@bool/config_workspaceFadeAdjacentScreens</bool> + <bool name="preferences_interface_homescreen_hide_icon_labels_default">false</bool> + <string name="preferences_interface_drawer_scrolling_transition_effect">stack</string> + <bool name="preferences_interface_drawer_scrolling_fade_adjacent_default">false</bool> + <bool name="preferences_interface_drawer_hide_icon_labels_default">false</bool> + <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> +</resources> |