summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-09 12:49:26 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-07-09 12:49:26 -0700
commitbda4584bf6ce5ddad0bff1b0ae32607552e0a2fc (patch)
treeb92fc5d8d39ddebdbeef190e949a8bd49028ff33
parent5e7e8da04d4a7c5bef51cbb1121f956f1496784e (diff)
parentf9b7faee88313c4daf3e3fb34203978de20b7ce0 (diff)
downloadframeworks_base-bda4584bf6ce5ddad0bff1b0ae32607552e0a2fc.zip
frameworks_base-bda4584bf6ce5ddad0bff1b0ae32607552e0a2fc.tar.gz
frameworks_base-bda4584bf6ce5ddad0bff1b0ae32607552e0a2fc.tar.bz2
am f9b7faee: Merge change 6503 into donut
Merge commit 'f9b7faee88313c4daf3e3fb34203978de20b7ce0' * commit 'f9b7faee88313c4daf3e3fb34203978de20b7ce0': Hide soft keyboard in SearchDialog.dismiss()
-rw-r--r--core/java/android/app/SearchDialog.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index 022a9d9..6d6aca4 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -991,7 +991,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
};
@Override
- public void cancel() {
+ public void dismiss() {
if (!isShowing()) return;
// We made sure the IME was displayed, so also make sure it is closed
@@ -1003,7 +1003,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
getWindow().getDecorView().getWindowToken(), 0);
}
- super.cancel();
+ super.dismiss();
}
/**