summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-09-21 14:28:49 -0400
committerCary Clark <cary@android.com>2010-09-21 14:48:29 -0400
commit5feb8ad06b1000aec9403209b10b5d5210b2e241 (patch)
treeffdc32026a10dbd07eb77c038764187758b3f1cb
parent1da09d51a50843a5a445b7c92f3742f67da99ae6 (diff)
downloadpackages_apps_Browser-5feb8ad06b1000aec9403209b10b5d5210b2e241.zip
packages_apps_Browser-5feb8ad06b1000aec9403209b10b5d5210b2e241.tar.gz
packages_apps_Browser-5feb8ad06b1000aec9403209b10b5d5210b2e241.tar.bz2
Do not merge: Don't show cab when invoking select text from menu
Leave the experiment intact for posterity. Also, remove spurious comment. Change-Id: I44519d4cf6843acf9aa056a6452e0e34216f2968 http://b/2626451
-rw-r--r--src/com/android/browser/BrowserActivity.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index aca7003..098e3b2 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1287,7 +1287,6 @@ public class BrowserActivity extends Activity
}
private WebView showDialog(WebDialog dialog) {
- // Need to do something special for Tablet
Tab tab = mTabControl.getCurrentTab();
if (tab.getSubWebView() == null) {
// If the find or select is being performed on the main webview,
@@ -1399,7 +1398,14 @@ public class BrowserActivity extends Activity
break;
case R.id.select_text_id:
- showSelectDialog();
+ if (true) {
+ Tab currentTab = mTabControl.getCurrentTab();
+ if (currentTab != null) {
+ currentTab.getWebView().setUpSelect();
+ }
+ } else {
+ showSelectDialog();
+ }
break;
case R.id.page_info_menu_id: