diff options
| author | Winson Chung <winsonc@google.com> | 2012-11-29 16:05:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-29 16:05:18 -0800 |
| commit | 7e1820a7224c9b8726c1687924ff81dda20af5cc (patch) | |
| tree | 360d2cf9ec65fdc28ea1b5d65a12438ba8ade345 /res | |
| parent | 553e157a0f481b70c990e216b1c7b6a0a2b98610 (diff) | |
| parent | beaa8a4d367ec14511fe6560e2103a3f7fb9d2ad (diff) | |
| download | android_packages_apps_Trebuchet-7e1820a7224c9b8726c1687924ff81dda20af5cc.tar.gz android_packages_apps_Trebuchet-7e1820a7224c9b8726c1687924ff81dda20af5cc.tar.bz2 android_packages_apps_Trebuchet-7e1820a7224c9b8726c1687924ff81dda20af5cc.zip | |
am beaa8a4d: am ab9dce32: am 7819abd2: Fixing issue where the cling is offset. (Bug 7633074)
* commit 'beaa8a4d367ec14511fe6560e2103a3f7fb9d2ad':
Fixing issue where the cling is offset. (Bug 7633074)
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/launcher.xml | 27 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 27 | ||||
| -rw-r--r-- | res/layout-sw720dp/launcher.xml | 27 |
3 files changed, 45 insertions, 36 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 0892352a9..051d8b25c 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -86,6 +86,21 @@ android:id="@+id/qsb_bar" layout="@layout/qsb_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 + top of that view. --> + <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" + android:layout_height="match_parent" + android:visibility="gone" /> + <com.android.launcher2.DrawableStateProxyView android:id="@+id/voice_button_proxy" android:layout_width="@dimen/qsb_bar_height" @@ -102,17 +117,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> - - <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" - android:layout_height="match_parent" - android:visibility="gone" /> </com.android.launcher2.DragLayer> </FrameLayout>
\ No newline at end of file diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index ad7eff4ba..445c85ea4 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -85,6 +85,21 @@ android:id="@+id/qsb_bar" layout="@layout/qsb_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 + top of that view. --> + <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" + android:layout_height="match_parent" + android:visibility="gone" /> + <com.android.launcher2.DrawableStateProxyView android:id="@+id/voice_button_proxy" android:layout_width="80dp" @@ -100,17 +115,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> - - <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" - android:layout_height="match_parent" - android:visibility="gone" /> </com.android.launcher2.DragLayer> </FrameLayout>
\ No newline at end of file diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index b5540423e..81a8f37da 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -85,6 +85,21 @@ android:id="@+id/qsb_bar" layout="@layout/qsb_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 + top of that view. --> + <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" + android:layout_height="match_parent" + android:visibility="gone" /> + <com.android.launcher2.DrawableStateProxyView android:id="@+id/voice_button_proxy" android:layout_width="80dp" @@ -101,17 +116,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> - - <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" - android:layout_height="match_parent" - android:visibility="gone" /> </com.android.launcher2.DragLayer> </FrameLayout>
\ No newline at end of file |