commit 236d431cc582df9b2841718195ae977c3948f751
author Winson Chung <winsonc@google.com> Mon Aug 22 15:12:27 2011 -0700
committer Winson Chung <winsonc@google.com> Mon Aug 22 15:13:15 2011 -0700
tree 187002883b65fc440dd96919369b597a7265d225
parent 30a22f32b07f7a864112d92ac959db0e84e0c374

Adding settings menu back... (5165175)

Change-Id: Iaf413a7e9f9aecfa2c868b8700571884af7821ee

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e71f7da..871d7e9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -149,7 +149,7 @@
     <!-- Noun, menu item used to bring down the notifications shade -->
     <string name="menu_notifications">Notifications</string>
     <!-- Noun, menu item used to show the system settings -->
-    <string name="menu_settings">Settings</string>
+    <string name="menu_settings">System Settings</string>
     <!-- Noun, menu item used to show help. [CHAR_LIMIT=none] -->
     <string name="menu_help">Help</string>
 

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index a0601e0..dc298bc 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -109,7 +109,8 @@
     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 @@
         }
 
         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');