diff options
| author | nebkat <nebkat@gmail.com> | 2012-12-24 05:48:24 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-12-24 05:48:24 -0800 |
| commit | 3f4a94b7328c129cbf94fb958b2fb75942b69d20 (patch) | |
| tree | 3846d5ff5416e38e5354143aac3dc1b14a55f0d5 /src | |
| parent | 785443836163252e3c3e0edd12ef9778ea3a8c84 (diff) | |
| parent | 3872581cda9466b73cf40d388a84f20e5d8da00a (diff) | |
| download | android_packages_apps_Trebuchet-3f4a94b7328c129cbf94fb958b2fb75942b69d20.tar.gz android_packages_apps_Trebuchet-3f4a94b7328c129cbf94fb958b2fb75942b69d20.tar.bz2 android_packages_apps_Trebuchet-3f4a94b7328c129cbf94fb958b2fb75942b69d20.zip | |
Merge "Revert "Launcher: Trebuchet settings visibility"" into cm-10.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Launcher.java | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java index 95ad60248..e8efcc60a 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; } |