PagedView: Transition Effects

Change-Id: Ib134705952877165c334181548d577b3dceece68

5 files changed, 83 insertions, 17 deletions

diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml
index ada2b2483..fad5ebe18 100644
--- a/res/layout/overview_panel.xml
+++ b/res/layout/overview_panel.xml
@@ -17,19 +17,44 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <TextView
-        android:id="@+id/default_screen_button"
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:orientation="horizontal"
         android:layout_gravity="center_horizontal|top"
-        android:paddingTop="@dimen/overview_panel_top_padding"
-        android:text="@string/default_screen_button_text"
-        android:drawablePadding="4dp"
-        android:drawableTop="@drawable/default_screen_button"
-        android:gravity="center_horizontal"
-        android:fontFamily="sans-serif-condensed"
-        android:textAllCaps="true"
-        android:textSize="12sp" />
+        android:paddingTop="@dimen/overview_panel_top_padding">
+
+        <TextView
+            android:id="@+id/default_screen_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/overview_panel_button_spacing"
+            android:paddingRight="@dimen/overview_panel_button_spacing"
+            android:text="@string/default_screen_button_text"
+            android:drawablePadding="4dp"
+            android:drawableTop="@drawable/default_screen_button"
+            android:gravity="center_horizontal"
+            android:fontFamily="sans-serif-condensed"
+            android:textAllCaps="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/transition_effect_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/overview_panel_button_spacing"
+            android:paddingRight="@dimen/overview_panel_button_spacing"
+            android:text="@string/transition_effect_button_text"
+            android:drawablePadding="4dp"
+            android:drawableTop="@drawable/wallpaper_button"
+            android:gravity="center_horizontal"
+            android:fontFamily="sans-serif-condensed"
+            android:textAllCaps="true"
+            android:textSize="12sp" />
+
+    </LinearLayout>
 
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
@@ -43,6 +68,8 @@
             android:id="@+id/wallpaper_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/overview_panel_button_spacing"
+            android:paddingRight="@dimen/overview_panel_button_spacing"
             android:text="@string/wallpaper_button_text"
             android:drawablePadding="4dp"
             android:drawableTop="@drawable/wallpaper_button"
@@ -54,6 +81,8 @@
             android:id="@+id/sort_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/overview_panel_button_spacing"
+            android:paddingRight="@dimen/overview_panel_button_spacing"
             android:text="@string/sort_button_text"
             android:drawablePadding="4dp"
             android:drawableTop="@drawable/wallpaper_button"
@@ -61,13 +90,12 @@
             android:fontFamily="sans-serif-condensed"
             android:textAllCaps="true"
             android:textSize="12sp" />
-        <Space
-            android:layout_width="@dimen/overview_panel_buttonSpacing"
-            android:layout_height="wrap_content"/>
         <TextView
             android:id="@+id/widget_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/overview_panel_button_spacing"
+            android:paddingRight="@dimen/overview_panel_button_spacing"
             android:text="@string/widget_button_text"
             android:drawablePadding="4dp"
             android:gravity="center_horizontal"
@@ -79,6 +107,8 @@
             android:id="@+id/filter_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/overview_panel_button_spacing"
+            android:paddingRight="@dimen/overview_panel_button_spacing"
             android:text="@string/filter_button_text"
             android:drawablePadding="4dp"
             android:gravity="center_horizontal"
@@ -86,13 +116,12 @@
             android:fontFamily="sans-serif-condensed"
             android:textAllCaps="true"
             android:textSize="12sp"/>
-        <Space
-            android:layout_width="@dimen/overview_panel_buttonSpacing"
-            android:layout_height="wrap_content"/>
         <TextView
             android:id="@+id/settings_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/overview_panel_button_spacing"
+            android:paddingRight="@dimen/overview_panel_button_spacing"
             android:text="@string/settings_button_text"
             android:drawablePadding="4dp"
             android:gravity="center_horizontal"
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>