summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-11-29 14:29:38 -0800
committerWinson Chung <winsonc@google.com>2012-11-29 14:30:30 -0800
commit7819abd2d191a170cbc9d4bd190001c465187a9d (patch)
tree63f5fd378c80fc9f7c33353cc9b128617229bae8 /res
parent1ef2123ccdf35f2e20ab180111bfa76c46c997e3 (diff)
downloadandroid_packages_apps_Trebuchet-7819abd2d191a170cbc9d4bd190001c465187a9d.tar.gz
android_packages_apps_Trebuchet-7819abd2d191a170cbc9d4bd190001c465187a9d.tar.bz2
android_packages_apps_Trebuchet-7819abd2d191a170cbc9d4bd190001c465187a9d.zip
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')
-rw-r--r--res/layout-land/launcher.xml27
-rw-r--r--res/layout-port/launcher.xml27
-rw-r--r--res/layout-sw720dp/launcher.xml27
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