diff options
| author | Winson Chung <winsonc@google.com> | 2012-11-29 14:29:38 -0800 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2012-11-29 14:30:30 -0800 |
| commit | 7819abd2d191a170cbc9d4bd190001c465187a9d (patch) | |
| tree | 63f5fd378c80fc9f7c33353cc9b128617229bae8 /res/layout-port | |
| parent | 1ef2123ccdf35f2e20ab180111bfa76c46c997e3 (diff) | |
| download | packages_apps_trebuchet-7819abd2d191a170cbc9d4bd190001c465187a9d.zip packages_apps_trebuchet-7819abd2d191a170cbc9d4bd190001c465187a9d.tar.gz packages_apps_trebuchet-7819abd2d191a170cbc9d4bd190001c465187a9d.tar.bz2 | |
Fixing issue where the cling is offset. (Bug 7633074)
- Also fixing issue where the workspace cling was showing on top of AllApps when you entered it for the first time.
Change-Id: I7d59ad153de192bc1d69537af1b4af632465138b
Diffstat (limited to 'res/layout-port')
| -rw-r--r-- | res/layout-port/launcher.xml | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index ad7eff4..445c85e 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 |