diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-05-24 11:36:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-24 11:36:51 -0700 |
| commit | ab285f8574c7807a3e8a4f5b26d5e06b870d19ce (patch) | |
| tree | ddc5faf9bcac84c69d02475e485feda635d5755a /src | |
| parent | 13a75d5f1ecdd216f76cb1a165b6af45acb7eec3 (diff) | |
| parent | 2e2656ccaa5ed6cc1adc2d50c8efb67777422834 (diff) | |
| download | android_packages_apps_Trebuchet-ab285f8574c7807a3e8a4f5b26d5e06b870d19ce.tar.gz android_packages_apps_Trebuchet-ab285f8574c7807a3e8a4f5b26d5e06b870d19ce.tar.bz2 android_packages_apps_Trebuchet-ab285f8574c7807a3e8a4f5b26d5e06b870d19ce.zip | |
am 2e2656cc: Merge "Disable hotseat buttons if AllApps is visible." into froyo
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 3 |
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; |