diff options
author | Michael Jurka <mikejurka@google.com> | 2010-12-20 16:06:10 -0800 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2010-12-20 16:53:26 -0800 |
commit | b8e14479da7209ca811a753b3256fe4a0b49a873 (patch) | |
tree | 022bdba062825d1b115b984789fd9146e76dad78 /src/com/android/launcher2/Launcher.java | |
parent | bb6e05bca62d399c5c81a7f57d5b167fce207fee (diff) | |
download | android_packages_apps_Trebuchet-b8e14479da7209ca811a753b3256fe4a0b49a873.tar.gz android_packages_apps_Trebuchet-b8e14479da7209ca811a753b3256fe4a0b49a873.tar.bz2 android_packages_apps_Trebuchet-b8e14479da7209ca811a753b3256fe4a0b49a873.zip |
Don't show application info icon on workspace
Change-Id: I79e59211633609f4bd13e91a6c745ff28a309e2e
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 696380cd6..3c1c33657 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -987,12 +987,16 @@ public final class Launcher extends Activity deleteZone.setLauncher(this); deleteZone.setDragController(dragController); int deleteZoneHandleId; + + final View allAppsButton = findViewById(R.id.all_apps_button); + final View divider = findViewById(R.id.divider); + final View configureButton = findViewById(R.id.configure_button); + if (LauncherApplication.isScreenXLarge()) { - deleteZoneHandleId = R.id.all_apps_button; + mDeleteZone.setOverlappingViews(new View[] { allAppsButton, divider, configureButton }); } else { - deleteZoneHandleId = R.id.all_apps_button_cluster; + deleteZone.setOverlappingView(configureButton); } - deleteZone.setHandle(findViewById(deleteZoneHandleId)); dragController.addDragListener(deleteZone); DeleteZone allAppsDeleteZone = (DeleteZone) findViewById(R.id.all_apps_delete_zone); @@ -1012,17 +1016,10 @@ public final class Launcher extends Activity allAppsInfoTarget.setDragAndDropEnabled(false); View marketButton = findViewById(R.id.market_button); if (marketButton != null) { - allAppsInfoTarget.setHandle(marketButton); + allAppsInfoTarget.setOverlappingView(marketButton); } } - ApplicationInfoDropTarget infoButton = (ApplicationInfoDropTarget)findViewById(R.id.info_button); - if (infoButton != null) { - infoButton.setLauncher(this); - infoButton.setHandle(findViewById(R.id.configure_button)); - dragController.addDragListener(infoButton); - } - dragController.setDragScoller(workspace); dragController.setScrollView(dragLayer); dragController.setMoveTarget(workspace); @@ -1030,9 +1027,6 @@ public final class Launcher extends Activity // The order here is bottom to top. dragController.addDropTarget(workspace); dragController.addDropTarget(deleteZone); - if (infoButton != null) { - dragController.addDropTarget(infoButton); - } if (allAppsInfoTarget != null) { dragController.addDropTarget(allAppsInfoTarget); } @@ -2600,7 +2594,7 @@ public final class Launcher extends Activity hideOrShowToolbarButton(true, allAppsButton, showSeq); hideOrShowToolbarButton(true, divider, showSeq); hideOrShowToolbarButton(true, configureButton, showSeq); - mDeleteZone.setHandle(allAppsButton); + mDeleteZone.setOverlappingViews(new View[] { allAppsButton, divider, configureButton }); break; case ALL_APPS: hideOrShowToolbarButton(false, configureButton, hideSeq); @@ -2613,7 +2607,7 @@ public final class Launcher extends Activity hideOrShowToolbarButton(false, searchButton, hideSeq); hideOrShowToolbarButton(false, divider, hideSeq); hideOrShowToolbarButton(false, configureButton, hideSeq); - mDeleteZone.setHandle(allAppsButton); + //mDeleteZone.setOverlappingView(configureButton); break; } } |