UI fixes.

[Dictionary.git] / src / com / hughes / android / dictionary / HtmlDisplayActivity.java

diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
index f4bc8ce795661808a9dc25d372151521be492bef..a987f5d4146bc85b71387418ecb89e541767760f 100644 (file)
--- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -17,23 +17,23 @@ package com.hughes.android.dictionary;
 import android.app.Activity;\r
 import android.content.Intent;\r
 import android.os.Bundle;\r
-import android.view.ContextMenu;\r
-import android.view.ContextMenu.ContextMenuInfo;\r
-import android.view.MenuItem;\r
-import android.view.MenuItem.OnMenuItemClickListener;\r
+import android.util.Log;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
-import android.view.View.OnCreateContextMenuListener;\r
 import android.webkit.WebView;\r
 import android.widget.Button;\r
 \r
 import com.hughes.util.StringUtil;\r
 \r
 public final class HtmlDisplayActivity extends Activity {\r
+    \r
+  static final String LOG = "QuickDic";\r
+\r
   \r
   static final String HTML_RES = "html_res";\r
   static final String HTML = "html";\r
   static final String TEXT_TO_HIGHLIGHT = "textToHighlight";\r
+  static final String SHOW_OK_BUTTON = "showOKButton";\r
   \r
   public static Intent getHelpLaunchIntent() {\r
     final Intent intent = new Intent();\r
@@ -49,11 +49,12 @@ public final class HtmlDisplayActivity extends Activity {
     return intent;\r
   }\r
 \r
-  public static Intent getHtmlIntent(final String html, final String textToHighlight) {\r
+  public static Intent getHtmlIntent(final String html, final String textToHighlight, final boolean showOkButton) {\r
     final Intent intent = new Intent();\r
     intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(), HtmlDisplayActivity.class.getName());\r
     intent.putExtra(HTML, html);\r
     intent.putExtra(TEXT_TO_HIGHLIGHT, textToHighlight);\r
+    intent.putExtra(SHOW_OK_BUTTON, showOkButton);\r
     return intent;\r
   }\r
 \r
@@ -76,8 +77,11 @@ public final class HtmlDisplayActivity extends Activity {
     webView.loadData(html, "text/html", "utf-8");\r
     \r
     final String textToHighlight = getIntent().getStringExtra(TEXT_TO_HIGHLIGHT);\r
-    if (textToHighlight != null && "".equals(textToHighlight)) {\r
-        webView.findAllAsync(textToHighlight);\r
+    if (textToHighlight != null && !"".equals(textToHighlight)) {\r
+        Log.d(LOG, "Highlighting text: " + textToHighlight);\r
+        // This isn't working:\r
+        webView.findAll(textToHighlight);\r
+        //webView.showFindDialog(textToHighlight, false);\r
     }\r
     \r
     final Button okButton = (Button) findViewById(R.id.okButton);\r
@@ -87,6 +91,9 @@ public final class HtmlDisplayActivity extends Activity {
         finish();\r
       }\r
     });\r
+    if (!getIntent().getBooleanExtra(SHOW_OK_BUTTON, true)) {\r
+        okButton.setVisibility(View.INVISIBLE);\r
+    }\r
   }\r
 \r
 }\r