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 | |
parent | 0daed36da7dab3172f05aa3dc29b7facac01ce6e (diff) | |
download | packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.tar.gz packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.tar.bz2 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')
-rw-r--r-- | res/layout-port/launcher.xml | 9 | ||||
-rw-r--r-- | res/layout/overview_panel.xml | 1 | ||||
-rw-r--r-- | res/layout/settings_pane.xml | 1 | ||||
-rw-r--r-- | res/menu/apps_customize_sort_mode.xml | 11 | ||||
-rw-r--r-- | res/menu/scrolling_settings.xml | 10 | ||||
-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 |
8 files changed, 48 insertions, 6 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 9e98d4257..ad1027829 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -48,10 +48,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <include layout="@layout/overview_panel" - android:id="@+id/overview_panel" - android:visibility="gone" /> - <!-- Keep these behind the workspace so that they are not visible when we go into AllApps --> <include @@ -82,5 +78,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> + + <include layout="@layout/overview_panel" + android:id="@+id/overview_panel" + android:visibility="gone" /> + </com.android.launcher3.DragLayer> </FrameLayout> diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml index ea12aefe4..8fed47718 100644 --- a/res/layout/overview_panel.xml +++ b/res/layout/overview_panel.xml @@ -22,7 +22,6 @@ android:gravity="bottom" slidingpanel:overlay="false" slidingpanel:panelHeight="@dimen/sliding_panel_padding" > - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/default_home_screen_panel" diff --git a/res/layout/settings_pane.xml b/res/layout/settings_pane.xml index cb79e37c6..e12839e10 100644 --- a/res/layout/settings_pane.xml +++ b/res/layout/settings_pane.xml @@ -4,6 +4,7 @@ android:layout_height="match_parent" > <LinearLayout + android:id="@+id/settings_container" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_horizontal|bottom" diff --git a/res/menu/apps_customize_sort_mode.xml b/res/menu/apps_customize_sort_mode.xml new file mode 100644 index 000000000..cb5f8faff --- /dev/null +++ b/res/menu/apps_customize_sort_mode.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <group android:checkableBehavior="single"> + <item android:id="@+id/sort_mode_title" + android:title="@string/sort_mode_title" /> + <item android:id="@+id/sort_mode_launch_count" + android:title="@string/sort_mode_launch_count" /> + <item android:id="@+id/sort_mode_install_time" + android:title="@string/sort_mode_install_time" /> + </group> +</menu>
\ No newline at end of file diff --git a/res/menu/scrolling_settings.xml b/res/menu/scrolling_settings.xml new file mode 100644 index 000000000..e29a3cac6 --- /dev/null +++ b/res/menu/scrolling_settings.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/scrolling_page_outlines" + android:checkable="true" + android:title="@string/scrolling_page_outlines"/> + <item android:id="@+id/scrolling_fade_adjacent" + android:checkable="true" + android:title="@string/scrolling_fade_adjacent"/> +</menu>
\ No newline at end of file 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> |