commit e42cd70f08e1a7f02713f4436309ea508d6c9145
author Patrick Dubroy <dubroy@google.com> Wed Sep 08 22:53:16 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 08 22:53:16 2010 -0700
tree 8ba07b63034d2a11bcf932496e5d9d47a0699546
parent 430c53bc80be01996b45e55687885d6c05314645
parent 5905bca4c4d07051f0c77b30bf7b224e85dddf5a

Merge "Re-enable menu button -- real fix is to disable at system level."

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index a6f0a0e..740e14b 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1307,7 +1307,7 @@
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (isWorkspaceLocked() || LauncherApplication.isScreenXLarge()) {
+        if (isWorkspaceLocked()) {
             return false;
         }