summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2010-05-24 11:22:41 -0400
committerDaniel Sandler <dsandler@android.com>2010-05-24 11:22:41 -0400
commit3e9454a9ac98eafd0ac92a2762b03a50a28c8eeb (patch)
tree1d1e3a2d21f91489542279bdc7d6969a1f0f1244 /src/com
parentd0b7a8cf2b26afe598799d4a451a985f0da45c2d (diff)
downloadandroid_packages_apps_Trebuchet-3e9454a9ac98eafd0ac92a2762b03a50a28c8eeb.tar.gz
android_packages_apps_Trebuchet-3e9454a9ac98eafd0ac92a2762b03a50a28c8eeb.tar.bz2
android_packages_apps_Trebuchet-3e9454a9ac98eafd0ac92a2762b03a50a28c8eeb.zip
Disable hotseat buttons if AllApps is visible.
Bug: 2707845 Change-Id: Ic4039f9737b3218a45bb3e8456c47927edd3fe3d
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher2/Launcher.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 132f0e907..52f122479 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -204,7 +204,6 @@ public final class Launcher extends Activity
private ImageView mNextView;
// Hotseats (quick-launch icons next to AllApps)
- // TODO: move these intial intents out to Uris in an XML resource
private static final int NUM_HOTSEATS = 2;
private String[] mHotseatConfig = null;
private Intent[] mHotseats = null;
@@ -782,6 +781,8 @@ public final class Launcher extends Activity
@SuppressWarnings({"UnusedDeclaration"})
public void launchHotSeat(View v) {
+ if (isAllAppsVisible()) return;
+
int index = -1;
if (v.getId() == R.id.hotseat_left) {
index = 0;