Revert "Launcher: Trebuchet settings visibility"

This reverts commit 72e1c32434f58a2a0e231b2cd6d75f980adfc285

Change-Id: I4bb4f45c9185c546f197109b240612d47528059c

1 files changed, 8 insertions, 17 deletions

diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index 95ad602..e8efcc6 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -1756,17 +1756,17 @@ public final class Launcher extends Activity
         menu.add(0, MENU_MANAGE_APPS, 0, R.string.menu_manage_apps)
             .setIcon(android.R.drawable.ic_menu_manage)
             .setIntent(manageApps)
-            .setAlphabeticShortcut('A');
-
-        menu.add(0, MENU_PREFERENCES, 0, R.string.menu_preferences)
-            .setIcon(android.R.drawable.ic_menu_preferences)
-            .setIntent(preferences)
-            .setAlphabeticShortcut('P');
-
+            .setAlphabeticShortcut('M');
+        if (!getResources().getBoolean(R.bool.config_cyanogenmod)) {
+            menu.add(0, MENU_PREFERENCES, 0, R.string.menu_preferences)
+                .setIcon(android.R.drawable.ic_menu_preferences)
+                .setIntent(preferences)
+                .setAlphabeticShortcut('O');
+        }
         menu.add(0, MENU_SYSTEM_SETTINGS, 0, R.string.menu_settings)
             .setIcon(android.R.drawable.ic_menu_preferences)
             .setIntent(settings)
-            .setAlphabeticShortcut('S');
+            .setAlphabeticShortcut('P');
         if (!helpUrl.isEmpty()) {
             menu.add(0, MENU_HELP, 0, R.string.menu_help)
                 .setIcon(android.R.drawable.ic_menu_help)
@@ -1786,15 +1786,6 @@ public final class Launcher extends Activity
         boolean allAppsVisible = (mAppsCustomizeTabHost.getVisibility() == View.VISIBLE);
         menu.setGroupVisible(MENU_GROUP_WALLPAPER, !allAppsVisible);
 
-        Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
-        launcherIntent.addCategory(Intent.CATEGORY_HOME);
-        launcherIntent.addCategory(Intent.CATEGORY_DEFAULT);
-        ActivityInfo defaultLauncher = getPackageManager().resolveActivity(launcherIntent, PackageManager.MATCH_DEFAULT_ONLY).activityInfo;
-        // Hide preferences if not on CyanogenMod or not default launcher
-        // (in which case preferences don't get shown in system settings)
-        boolean preferencesVisible = !getPackageManager().hasSystemFeature("com.cyanogenmod.android") ||
-                !defaultLauncher.packageName.equals(getClass().getPackage().getName());
-        menu.findItem(MENU_PREFERENCES).setVisible(preferencesVisible);
         return true;
     }