summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Workspace.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-07-21 11:46:32 -0700
committerWinson Chung <winsonc@google.com>2011-07-21 11:48:43 -0700
commit4d279d94ade1c0d455404312b3c9cfde0078c547 (patch)
treeaa7bf49d38894173563d98df254475ca7a104969 /src/com/android/launcher2/Workspace.java
parentf55cd6a46c25cab8b3a9e90ba3cff4ca237149df (diff)
downloadandroid_packages_apps_Trebuchet-4d279d94ade1c0d455404312b3c9cfde0078c547.tar.gz
android_packages_apps_Trebuchet-4d279d94ade1c0d455404312b3c9cfde0078c547.tar.bz2
android_packages_apps_Trebuchet-4d279d94ade1c0d455404312b3c9cfde0078c547.zip
Fixing various issues with the dock.
- Prevent crash due to no overlays in certain device configurations - Fixing kb crash and adding content description for Apps button Change-Id: Ie2a2bc29e7b9408a165f93d108fdd803193afc29
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
-rw-r--r--src/com/android/launcher2/Workspace.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index b86fa4148..e71e0f8a6 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -453,6 +453,7 @@ public class Workspace extends SmoothPagedView
final CellLayout layout;
if (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
layout = mLauncher.getHotseat().getLayout();
+ child.setOnKeyListener(null);
if (screen < 0) {
screen = mLauncher.getHotseat().getOrderInHotseat(x, y);
@@ -464,6 +465,7 @@ public class Workspace extends SmoothPagedView
}
} else {
layout = (CellLayout) getChildAt(screen);
+ child.setOnKeyListener(new BubbleTextViewKeyEventListener());
}
CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();