diff options
author | Adam Cohen <adamcohen@google.com> | 2014-07-21 17:44:06 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-08-10 18:29:36 -0700 |
commit | 9bfdb76aaf5c8679b8f2ee3a9a3df2becefb947a (patch) | |
tree | f7a8c90e206701c2129eb5c7ed4956c265478329 /res | |
parent | 6075170b838bfe7a040bbff25c2c22859b7d6ee5 (diff) | |
download | android_packages_apps_Trebuchet-9bfdb76aaf5c8679b8f2ee3a9a3df2becefb947a.tar.gz android_packages_apps_Trebuchet-9bfdb76aaf5c8679b8f2ee3a9a3df2becefb947a.tar.bz2 android_packages_apps_Trebuchet-9bfdb76aaf5c8679b8f2ee3a9a3df2becefb947a.zip |
Polishing the AllApps transition
-> separating HW layers during animation to be siblings
instead of parent-child (was destroying parent layer
on each frame)
-> Unifying material transition with pre-L, everything
is the same, just missing the reveal.
Change-Id: I8f7d5e658c2d9298bea83ce8199cb35e6fc0d44e
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/apps_customize_pane.xml | 31 | ||||
-rw-r--r-- | res/values/config.xml | 3 |
2 files changed, 24 insertions, 10 deletions
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index 007c5362e..03e433ac9 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -24,17 +24,30 @@ android:clipChildren="false" android:orientation="vertical"> - <com.android.launcher3.AppsCustomizePagedView - android:id="@+id/apps_customize_pane_content" + <FrameLayout android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1" - launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" - launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" - launcher:clingFocusedX="@integer/apps_customize_cling_focused_x" - launcher:clingFocusedY="@integer/apps_customize_cling_focused_y" - launcher:maxGap="@dimen/workspace_max_gap" - launcher:pageIndicator="@+id/apps_customize_page_indicator" /> + android:layout_weight="1"> + <FrameLayout + android:id="@+id/fake_page_container" + android:layout_width="match_parent" + android:layout_height="match_parent" > + <FrameLayout + android:id="@+id/fake_page" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </FrameLayout> + <com.android.launcher3.AppsCustomizePagedView + android:id="@+id/apps_customize_pane_content" + android:layout_width="match_parent" + android:layout_height="match_parent" + launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" + launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" + launcher:clingFocusedX="@integer/apps_customize_cling_focused_x" + launcher:clingFocusedY="@integer/apps_customize_cling_focused_y" + launcher:maxGap="@dimen/workspace_max_gap" + launcher:pageIndicator="@+id/apps_customize_page_indicator" /> + </FrameLayout> <include android:id="@+id/apps_customize_page_indicator" layout="@layout/page_indicator" diff --git a/res/values/config.xml b/res/values/config.xml index 3a862c504..a16f265a8 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -31,7 +31,8 @@ <!-- Fade/zoom in/out duration & scale in the AllApps transition. Note: This should be less than the workspaceShrinkTime as they happen together. --> - <integer name="config_appsCustomizeRevealTime">350</integer> + <integer name="config_appsCustomizeRevealTime">220</integer> + <integer name="config_appsCustomizeItemsAlphaStagger">60</integer> <integer name="config_appsCustomizeZoomInTime">350</integer> <integer name="config_appsCustomizeZoomOutTime">600</integer> <integer name="config_appsCustomizeZoomScaleFactor">7</integer> |