diff options
| author | Winson Chung <winsonc@google.com> | 2014-01-16 23:07:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-16 23:07:02 +0000 |
| commit | f8584042713aad82f9d057ecaace8a9ad1aad0bc (patch) | |
| tree | 649f4d436dc980cc9e2db00c017f22eaf640861f /res/layout-sw720dp/launcher.xml | |
| parent | 1ba0a30e6545a8c313d0ef355a101f661bbf778c (diff) | |
| parent | 205cd7727f3bd8b65892c580e6f243464878fe6e (diff) | |
| download | android_packages_apps_Trebuchet-f8584042713aad82f9d057ecaace8a9ad1aad0bc.tar.gz android_packages_apps_Trebuchet-f8584042713aad82f9d057ecaace8a9ad1aad0bc.tar.bz2 android_packages_apps_Trebuchet-f8584042713aad82f9d057ecaace8a9ad1aad0bc.zip | |
Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermit
Diffstat (limited to 'res/layout-sw720dp/launcher.xml')
| -rw-r--r-- | res/layout-sw720dp/launcher.xml | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 64b0fa0d6..685d03c6f 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -64,17 +64,31 @@ <!-- 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 top of that view. --> + <com.android.launcher3.ScrimView + android:id="@+id/cling_scrim" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> <include layout="@layout/first_run_cling" android:id="@+id/first_run_cling" 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" android:layout_height="match_parent" android:visibility="gone" /> - <include layout="@layout/folder_cling" android:id="@+id/folder_cling" android:layout_width="match_parent" |