diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-01-15 19:20:31 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-01-15 19:20:31 +0300 |
| commit | 436ab8aa87242624d1d488bb8f98127cd0ebb074 (patch) | |
| tree | 7b96155c032fe6232d8fe679957acd9ec8deedad /src/com | |
| parent | 0e701edbee096aad9a55cb369f726c1ccecf57d5 (diff) | |
| parent | 658ba880640b57fa11e8afb557664f14872e1c10 (diff) | |
| download | android_packages_apps_Trebuchet-436ab8aa87242624d1d488bb8f98127cd0ebb074.tar.gz android_packages_apps_Trebuchet-436ab8aa87242624d1d488bb8f98127cd0ebb074.tar.bz2 android_packages_apps_Trebuchet-436ab8aa87242624d1d488bb8f98127cd0ebb074.zip | |
Merge "AppsCustomize: Add market in overflow menu (only)" into ics
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Launcher.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java index c04f33bd2..25e5cd583 100644 --- a/src/com/cyanogenmod/trebuchet/Launcher.java +++ b/src/com/cyanogenmod/trebuchet/Launcher.java @@ -122,9 +122,11 @@ public final class Launcher extends Activity static final boolean DEBUG_WIDGETS = false; private static final int MENU_GROUP_WALLPAPER = 1; + private static final int MENU_GROUP_MARKET = 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_PREFERENCES = MENU_MANAGE_APPS + 1; + private static final int MENU_MARKET = MENU_MANAGE_APPS + 1; + private static final int MENU_PREFERENCES = MENU_MARKET + 1; private static final int MENU_SYSTEM_SETTINGS = MENU_PREFERENCES + 1; private static final int MENU_HELP = MENU_SYSTEM_SETTINGS + 1; @@ -1378,6 +1380,14 @@ public final class Launcher extends Activity .setIcon(android.R.drawable.ic_menu_manage) .setIntent(manageApps) .setAlphabeticShortcut('M'); + menu.add(MENU_GROUP_MARKET, MENU_MARKET, 0, R.string.menu_market) + .setAlphabeticShortcut('A') + .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + public boolean onMenuItemClick(MenuItem item) { + onClickAppMarketButton(null); + return true; + } + }); if (!getResources().getBoolean(R.bool.config_cyanogenmod)) { menu.add(0, MENU_PREFERENCES, 0, R.string.menu_preferences) .setIcon(android.R.drawable.ic_menu_preferences) @@ -1406,6 +1416,9 @@ public final class Launcher extends Activity } boolean allAppsVisible = (mAppsCustomizeTabHost.getVisibility() == View.VISIBLE); menu.setGroupVisible(MENU_GROUP_WALLPAPER, !allAppsVisible); + menu.setGroupVisible(MENU_GROUP_MARKET, allAppsVisible && + !ViewConfiguration.get(this).hasPermanentMenuKey() && + mAppMarketIntent != null); return true; } |