summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-07-21 17:44:06 -0700
committerAdam Cohen <adamcohen@google.com>2014-08-10 18:29:36 -0700
commit9bfdb76aaf5c8679b8f2ee3a9a3df2becefb947a (patch)
treef7a8c90e206701c2129eb5c7ed4956c265478329 /res/layout
parent6075170b838bfe7a040bbff25c2c22859b7d6ee5 (diff)
downloadandroid_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/layout')
-rw-r--r--res/layout/apps_customize_pane.xml31
1 files changed, 22 insertions, 9 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"