diff options
| author | Winson Chung <winsonc@google.com> | 2011-08-22 15:24:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-22 15:24:25 -0700 |
| commit | a0140c63f43a5064af7fe012247e62e588bba0b4 (patch) | |
| tree | e967aaee4d620eddd4c5a857e8b25f5aedd081ce /src/com/android/launcher2 | |
| parent | 929cb0a89426832a7114807fb8bb6fd77b893075 (diff) | |
| parent | 236d431cc582df9b2841718195ae977c3948f751 (diff) | |
| download | android_packages_apps_Trebuchet-a0140c63f43a5064af7fe012247e62e588bba0b4.tar.gz android_packages_apps_Trebuchet-a0140c63f43a5064af7fe012247e62e588bba0b4.tar.bz2 android_packages_apps_Trebuchet-a0140c63f43a5064af7fe012247e62e588bba0b4.zip | |
Merge "Adding settings menu back... (5165175)"
Diffstat (limited to 'src/com/android/launcher2')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index a0601e004..dc298bcfc 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -109,7 +109,8 @@ public final class Launcher extends Activity private static final int MENU_GROUP_WALLPAPER = 1; private static final int MENU_WALLPAPER_SETTINGS = Menu.FIRST + 1; private static final int MENU_MANAGE_APPS = MENU_WALLPAPER_SETTINGS + 1; - private static final int MENU_HELP = MENU_MANAGE_APPS + 1; + private static final int MENU_SYSTEM_SETTINGS = MENU_MANAGE_APPS + 1; + private static final int MENU_HELP = MENU_SYSTEM_SETTINGS + 1; private static final int REQUEST_CREATE_SHORTCUT = 1; private static final int REQUEST_CREATE_APPWIDGET = 5; @@ -1231,12 +1232,19 @@ public final class Launcher extends Activity } super.onCreateOptionsMenu(menu); + Intent settings = new Intent(android.provider.Settings.ACTION_SETTINGS); + settings.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK + | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); menu.add(MENU_GROUP_WALLPAPER, MENU_WALLPAPER_SETTINGS, 0, R.string.menu_wallpaper) .setIcon(android.R.drawable.ic_menu_gallery) .setAlphabeticShortcut('W'); menu.add(0, MENU_MANAGE_APPS, 0, R.string.menu_manage_apps) .setIcon(android.R.drawable.ic_menu_manage) .setAlphabeticShortcut('M'); + menu.add(0, MENU_SYSTEM_SETTINGS, 0, R.string.menu_settings) + .setIcon(android.R.drawable.ic_menu_preferences) + .setIntent(settings) + .setAlphabeticShortcut('P'); menu.add(0, MENU_HELP, 0, R.string.menu_help) .setIcon(android.R.drawable.ic_menu_help) .setAlphabeticShortcut('H'); |