Merge "Updating dialtacts to new package."
diff --git a/res/drawable-sw720dp-hdpi/workspace_bg.9.png b/res/drawable-sw720dp-hdpi/workspace_bg.9.png
new file mode 100644
index 0000000..5bbfa4f
--- /dev/null
+++ b/res/drawable-sw720dp-hdpi/workspace_bg.9.png
Binary files differ
diff --git a/res/drawable-sw720dp-mdpi/workspace_bg.9.png b/res/drawable-sw720dp-mdpi/workspace_bg.9.png
new file mode 100644
index 0000000..2856e09
--- /dev/null
+++ b/res/drawable-sw720dp-mdpi/workspace_bg.9.png
Binary files differ
diff --git a/res/drawable-sw720dp-xhdpi/workspace_bg.9.png b/res/drawable-sw720dp-xhdpi/workspace_bg.9.png
new file mode 100644
index 0000000..72269f2
--- /dev/null
+++ b/res/drawable-sw720dp-xhdpi/workspace_bg.9.png
Binary files differ
diff --git a/res/layout-sw720dp-port/workspace_cling.xml b/res/layout-sw720dp-port/workspace_cling.xml
deleted file mode 100644
index 29bea81..0000000
--- a/res/layout-sw720dp-port/workspace_cling.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<com.android.launcher2.Cling
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
- launcher:drawIdentifier="workspace_large">
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginLeft="@dimen/cling_text_block_offset_x"
- android:layout_marginTop="@dimen/cling_text_block_offset_y">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
- <TextView
- style="@style/ClingTitleText"
- android:text="@string/workspace_cling_title" />
- <TextView
- style="@style/ClingText"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/workspace_cling_move_item" />
- <Button
- style="@style/ClingButton"
- android:layout_marginTop="15dp"
- android:onClick="dismissWorkspaceCling" />
- </LinearLayout>
- </FrameLayout>
- <TextView
- style="@style/ClingText"
- android:layout_width="180dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="15dp"
- android:layout_marginRight="150dp"
- android:layout_gravity="right"
- android:gravity="right"
- android:text="@string/workspace_cling_open_all_apps" />
-</com.android.launcher2.Cling>
diff --git a/res/layout-sw720dp/workspace_cling.xml b/res/layout-sw720dp/workspace_cling.xml
index fd7d4f8..10e6976 100644
--- a/res/layout-sw720dp/workspace_cling.xml
+++ b/res/layout-sw720dp/workspace_cling.xml
@@ -16,12 +16,13 @@
<com.android.launcher2.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
- launcher:drawIdentifier="workspace_large">
+ launcher:drawIdentifier="workspace_portrait">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="@dimen/cling_text_block_offset_x"
- android:layout_marginTop="@dimen/cling_text_block_offset_y">
+ android:layout_marginLeft="20dp"
+ android:layout_marginRight="20dp"
+ android:layout_marginTop="90dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -34,19 +35,22 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/workspace_cling_move_item" />
- <Button
- style="@style/ClingButton"
- android:layout_marginTop="15dp"
- android:onClick="dismissWorkspaceCling" />
</LinearLayout>
</FrameLayout>
<TextView
style="@style/ClingText"
- android:layout_width="180dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="90dp"
- android:layout_marginRight="130dp"
- android:layout_gravity="right"
- android:gravity="right"
+ android:layout_marginLeft="20dp"
+ android:layout_marginRight="20dp"
+ android:layout_marginBottom="130dp"
+ android:layout_gravity="bottom"
+ android:gravity="center"
android:text="@string/workspace_cling_open_all_apps" />
+ <Button
+ style="@style/ClingButton"
+ android:layout_marginBottom="15dp"
+ android:layout_marginRight="10dp"
+ android:layout_gravity="bottom|right"
+ android:onClick="dismissWorkspaceCling" />
</com.android.launcher2.Cling>
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index 0bcd64c..a30e091 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -698,13 +698,10 @@
@Override
protected int getChildDrawingOrder(int childCount, int i) {
- // We don't want to prioritize the workspace drawing on top of the other children in
- // landscape for the overscroll event.
- if (LauncherApplication.isScreenLandscape(getContext())) {
- return super.getChildDrawingOrder(childCount, i);
- }
-
- if (mWorkspaceIndex == -1 || mQsbIndex == -1 ||
+ // TODO: We have turned off this custom drawing order because it now effects touch
+ // dispatch order. We need to sort that issue out and then decide how to go about this.
+ if (true || LauncherApplication.isScreenLandscape(getContext()) ||
+ mWorkspaceIndex == -1 || mQsbIndex == -1 ||
mLauncher.getWorkspace().isDrawingBackgroundGradient()) {
return i;
}
