diff options
author | Michael Jurka <mikejurka@google.com> | 2011-09-28 16:09:02 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-28 16:09:02 -0700 |
commit | 3e64b7ba03c3efddd580f6099abd443a481fe1f5 (patch) | |
tree | 2f869dd7c867c13a6c030b8885529097ee4705bd /src | |
parent | 1c30f3d7f991e35921027b060896616b3b9f9211 (diff) | |
parent | b964f9c5c27b3fc79f1321d307c97b2d48e1e461 (diff) | |
download | android_packages_apps_Trebuchet-3e64b7ba03c3efddd580f6099abd443a481fe1f5.tar.gz android_packages_apps_Trebuchet-3e64b7ba03c3efddd580f6099abd443a481fe1f5.tar.bz2 android_packages_apps_Trebuchet-3e64b7ba03c3efddd580f6099abd443a481fe1f5.zip |
Merge "remove references to google apps"
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 59386adfd..2997d6876 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1302,7 +1302,8 @@ public final class Launcher extends Activity Intent settings = new Intent(android.provider.Settings.ACTION_SETTINGS); settings.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); - Intent help = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.help_url))); + 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); @@ -1317,10 +1318,12 @@ public final class Launcher extends Activity .setIcon(android.R.drawable.ic_menu_preferences) .setIntent(settings) .setAlphabeticShortcut('P'); - menu.add(0, MENU_HELP, 0, R.string.menu_help) - .setIcon(android.R.drawable.ic_menu_help) - .setIntent(help) - .setAlphabeticShortcut('H'); + 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; } |