commit 4f50e8863f921ad2029d8d9450a31a143c151fa0
author Joe Onorato <joeo@google.com> Mon Nov 01 12:28:19 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 01 12:28:19 2010 -0700
tree 77df239ecbf741e5d4eaf5943308f714707a4736
parent de4077487dc32b3b00ec76f8f8ef11a02cccd0f2
parent 6c586dbb977c461b1c929f2b5e813ea3c0e658b4

Merge "Long press on menu no longer opens the IME."

core/java/android/app/ActionBar.java

diff --git a/core/java/android/app/ActionBar.java b/core/java/android/app/ActionBar.java
index 66038d8..b359ce6 100644
--- a/core/java/android/app/ActionBar.java
+++ b/core/java/android/app/ActionBar.java
@@ -299,7 +299,7 @@
      * 
      * <p>Example: setDisplayOptions(0, DISPLAY_SHOW_HOME) will disable the
      * {@link #DISPLAY_SHOW_HOME} option.
-     * setDisplayOptions(DISPLAY_SHOW_HOME, DISPLAY_HIDE_HOME | DISPLAY_USE_LOGO)
+     * setDisplayOptions(DISPLAY_SHOW_HOME, DISPLAY_SHOW_HOME | DISPLAY_USE_LOGO)
      * will enable {@link #DISPLAY_SHOW_HOME} and disable {@link #DISPLAY_USE_LOGO}.
      * 
      * @param options A combination of the bits defined by the DISPLAY_ constants