commit 4d279d94ade1c0d455404312b3c9cfde0078c547
author Winson Chung <winsonc@google.com> Thu Jul 21 11:46:32 2011 -0700
committer Winson Chung <winsonc@google.com> Thu Jul 21 11:48:43 2011 -0700
tree aa7bf49d38894173563d98df254475ca7a104969
parent f55cd6a46c25cab8b3a9e90ba3cff4ca237149df

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

src/com/android/launcher2/Hotseat.java

diff --git a/src/com/android/launcher2/Hotseat.java b/src/com/android/launcher2/Hotseat.java
index deab131..491691e 100644
--- a/src/com/android/launcher2/Hotseat.java
+++ b/src/com/android/launcher2/Hotseat.java
@@ -57,6 +57,7 @@
 
     public void setup(Launcher launcher) {
         mLauncher = launcher;
+        setOnKeyListener(new HotseatBubbleTextViewKeyEventListener());
     }
 
     CellLayout getLayout() {
@@ -96,11 +97,14 @@
                 inflater.inflate(R.layout.application, mContent, false);
         allAppsButton.setCompoundDrawablesWithIntrinsicBounds(null,
                 context.getResources().getDrawable(R.drawable.apps_hotseat_button), null, null);
-        // button.setText(context.getString(R.string.all_apps_button_label));
+        // allAppsButton.setText(context.getString(R.string.all_apps_button_label));
+        allAppsButton.setContentDescription(context.getString(R.string.all_apps_button_label));
         allAppsButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(android.view.View v) {
-                mLauncher.showAllApps(true);
+                if (mLauncher != null) {
+                    mLauncher.showAllApps(true);
+                }
             }
         });