diff options
| author | Winson Chung <winsonc@google.com> | 2010-09-28 09:39:16 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2010-09-28 09:39:16 -0700 |
| commit | d0cca08e4f025963dc192d23d635d9cb0f3c4cd0 (patch) | |
| tree | e3abb7c40b406c9e37c00cac122a8a9ac04ae1be /src/com/android/launcher2/Launcher.java | |
| parent | 58c64bc48ff7bae8658360ab8501b8520554511d (diff) | |
| parent | 7ad0141905fffe5bc359581fd3001abb10d3b730 (diff) | |
| download | android_packages_apps_Trebuchet-d0cca08e4f025963dc192d23d635d9cb0f3c4cd0.tar.gz android_packages_apps_Trebuchet-d0cca08e4f025963dc192d23d635d9cb0f3c4cd0.tar.bz2 android_packages_apps_Trebuchet-d0cca08e4f025963dc192d23d635d9cb0f3c4cd0.zip | |
resolved conflicts for merge of 7ad01419 to master
Change-Id: Idcbb2ffd6f0b72610dc06fc07695e3546f80da70
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index c8fc074a4..da1393c5d 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -122,7 +122,8 @@ public final class Launcher extends Activity private static final int MENU_GROUP_WALLPAPER = MENU_GROUP_ADD + 1; private static final int MENU_ADD = Menu.FIRST + 1; - private static final int MENU_WALLPAPER_SETTINGS = MENU_ADD + 1; + private static final int MENU_MANAGE_APPS = MENU_ADD + 1; + private static final int MENU_WALLPAPER_SETTINGS = MENU_MANAGE_APPS + 1; private static final int MENU_SEARCH = MENU_WALLPAPER_SETTINGS + 1; private static final int MENU_NOTIFICATIONS = MENU_SEARCH + 1; private static final int MENU_SETTINGS = MENU_NOTIFICATIONS + 1; @@ -1317,6 +1318,9 @@ public final class Launcher extends Activity menu.add(MENU_GROUP_ADD, MENU_ADD, 0, R.string.menu_add) .setIcon(android.R.drawable.ic_menu_add) .setAlphabeticShortcut('A'); + menu.add(0, MENU_MANAGE_APPS, 0, R.string.menu_manage_apps) + .setIcon(android.R.drawable.ic_menu_manage) + .setAlphabeticShortcut('M'); menu.add(MENU_GROUP_WALLPAPER, MENU_WALLPAPER_SETTINGS, 0, R.string.menu_wallpaper) .setIcon(android.R.drawable.ic_menu_gallery) .setAlphabeticShortcut('W'); @@ -1368,6 +1372,9 @@ public final class Launcher extends Activity case MENU_ADD: addItems(); return true; + case MENU_MANAGE_APPS: + manageApps(); + return true; case MENU_WALLPAPER_SETTINGS: startWallpaper(); return true; @@ -1428,6 +1435,10 @@ public final class Launcher extends Activity addAppWidgetImpl(appWidgetId); } + private void manageApps() { + startActivity(new Intent(android.provider.Settings.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS)); + } + void addAppWidgetFromPick(Intent data) { // TODO: catch bad widget exception when sent int appWidgetId = data.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1); |