diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-12-24 12:54:19 +0000 |
|---|---|---|
| committer | nebkat <nebkat@teamhacksung.org> | 2012-12-24 12:54:19 +0000 |
| commit | 72e1c32434f58a2a0e231b2cd6d75f980adfc285 (patch) | |
| tree | f192e1404fa150fc43c076d238fc129ee83a9ba3 /src | |
| parent | 73753d9fdfc2186ae3856c8854c7409c50a12f6e (diff) | |
| download | packages_apps_trebuchet-72e1c32434f58a2a0e231b2cd6d75f980adfc285.zip packages_apps_trebuchet-72e1c32434f58a2a0e231b2cd6d75f980adfc285.tar.gz packages_apps_trebuchet-72e1c32434f58a2a0e231b2cd6d75f980adfc285.tar.bz2 | |
Launcher: Trebuchet settings visibility
Use the com.cyanogenmod.android feature to detect CyanogenMod
rather than the config flag. Also, if Trebuchet is not the
default launcher it will be shown because system settings
always shows the default launcher preferences.
Change-Id: I61d349ad04269e6400e740a57ea8ebba21ec44db
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Launcher.java | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java index e8efcc6..95ad602 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('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'); - } + .setAlphabeticShortcut('A'); + + menu.add(0, MENU_PREFERENCES, 0, R.string.menu_preferences) + .setIcon(android.R.drawable.ic_menu_preferences) + .setIntent(preferences) + .setAlphabeticShortcut('P'); + menu.add(0, MENU_SYSTEM_SETTINGS, 0, R.string.menu_settings) .setIcon(android.R.drawable.ic_menu_preferences) .setIntent(settings) - .setAlphabeticShortcut('P'); + .setAlphabeticShortcut('S'); if (!helpUrl.isEmpty()) { menu.add(0, MENU_HELP, 0, R.string.menu_help) .setIcon(android.R.drawable.ic_menu_help) @@ -1786,6 +1786,15 @@ 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; } |