diff options
Diffstat (limited to 'res/layout-port/launcher.xml')
| -rw-r--r-- | res/layout-port/launcher.xml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 98cd0f3b6..c55aec867 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -35,8 +35,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" launcher:defaultScreen="@integer/config_workspaceDefaultScreen" - launcher:pageSpacing="@dimen/workspace_page_spacing" - launcher:pageIndicator="@id/page_indicator"> + launcher:pageIndicator="@+id/page_indicator"> </com.android.launcher3.Workspace> <include layout="@layout/hotseat" @@ -54,8 +53,8 @@ android:layout_gravity="center_horizontal" /> <include - android:id="@+id/qsb_bar" - layout="@layout/qsb_bar" /> + android:id="@+id/search_drop_target_bar" + layout="@layout/search_drop_target_bar" /> <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure that it is still visible during the transition to AllApps and doesn't overlay on @@ -70,6 +69,16 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" /> + <include layout="@layout/migration_cling" + android:id="@+id/migration_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + <include layout="@layout/migration_workspace_cling" + android:id="@+id/migration_workspace_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> <include layout="@layout/workspace_cling" android:id="@+id/workspace_cling" android:layout_width="match_parent" @@ -99,12 +108,6 @@ android:layout_height="match_parent" android:visibility="invisible" /> - <include layout="@layout/all_apps_cling" - android:id="@+id/all_apps_cling" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> - <include layout="@layout/overview_panel" android:id="@+id/overview_panel" android:visibility="gone" /> |