diff options
author | Michael Jurka <mikejurka@google.com> | 2013-09-11 18:08:54 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-09-19 20:06:26 +0200 |
commit | b94f3f804f3954666c73e0564391444ec77dc4d4 (patch) | |
tree | 0f60c2d24d5abeda1a8b84b45ddea8b69f16214a /src | |
parent | 8c082818a8ee813318e32a667883f73d7b94126a (diff) | |
download | android_packages_apps_Trebuchet-b94f3f804f3954666c73e0564391444ec77dc4d4.tar.gz android_packages_apps_Trebuchet-b94f3f804f3954666c73e0564391444ec77dc4d4.tar.bz2 android_packages_apps_Trebuchet-b94f3f804f3954666c73e0564391444ec77dc4d4.zip |
Remove options menu
When options menu is clicked, go into overview
mode
Bug: 10704930
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 67 |
1 files changed, 3 insertions, 64 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index daf9f096b..9777ea94a 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -77,7 +77,6 @@ import android.view.HapticFeedbackConstants; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; -import android.view.MenuItem; import android.view.MotionEvent; import android.view.Surface; import android.view.View; @@ -132,12 +131,6 @@ public class Launcher extends Activity static final boolean DEBUG_STRICT_MODE = false; static final boolean DEBUG_RESUME_TIME = false; - 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_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; private static final int REQUEST_PICK_APPLICATION = 6; @@ -1881,66 +1874,12 @@ public class Launcher extends Activity } @Override - public boolean onCreateOptionsMenu(Menu menu) { - if (isWorkspaceLocked()) { - return false; - } - - super.onCreateOptionsMenu(menu); - - Intent manageApps = new Intent(Settings.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS); - manageApps.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); - Intent settings = new Intent(android.provider.Settings.ACTION_SETTINGS); - settings.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); - String helpUrl = getString(R.string.help_url); - Intent help = new Intent(Intent.ACTION_VIEW, Uri.parse(helpUrl)); - help.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); - - 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) - .setIntent(manageApps) - .setAlphabeticShortcut('M'); - menu.add(0, MENU_SYSTEM_SETTINGS, 0, R.string.menu_settings) - .setIcon(android.R.drawable.ic_menu_preferences) - .setIntent(settings) - .setAlphabeticShortcut('P'); - if (!helpUrl.isEmpty()) { - menu.add(0, MENU_HELP, 0, R.string.menu_help) - .setIcon(android.R.drawable.ic_menu_help) - .setIntent(help) - .setAlphabeticShortcut('H'); - } - return true; - } - - @Override public boolean onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); - - if (mAppsCustomizeTabHost.isTransitioning()) { - return false; - } - boolean allAppsVisible = (mAppsCustomizeTabHost.getVisibility() == View.VISIBLE); - menu.setGroupVisible(MENU_GROUP_WALLPAPER, !allAppsVisible); - - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case MENU_WALLPAPER_SETTINGS: - startWallpaper(); - return true; + if (!mWorkspace.isInOverviewMode()) { + mWorkspace.enterOverviewMode(); } - - return super.onOptionsItemSelected(item); + return false; } @Override |