diff options
| author | Cary Clark <cary@android.com> | 2010-09-21 11:53:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 11:53:37 -0700 |
| commit | e7469105b6a1912f04b17c8055a232e33a6af8dd (patch) | |
| tree | 43e03ff2e1cc71fd500828d3108c5bd404250c90 /src/com/android/browser/BrowserActivity.java | |
| parent | c30cfc363ba3aaabfd3e0f6384ea40652353348f (diff) | |
| parent | 5feb8ad06b1000aec9403209b10b5d5210b2e241 (diff) | |
| download | packages_apps_Browser-e7469105b6a1912f04b17c8055a232e33a6af8dd.zip packages_apps_Browser-e7469105b6a1912f04b17c8055a232e33a6af8dd.tar.gz packages_apps_Browser-e7469105b6a1912f04b17c8055a232e33a6af8dd.tar.bz2 | |
am 5feb8ad0: Do not merge: Don\'t show cab when invoking select text from menu
Merge commit '5feb8ad06b1000aec9403209b10b5d5210b2e241' into gingerbread-plus-aosp
* commit '5feb8ad06b1000aec9403209b10b5d5210b2e241':
Do not merge: Don't show cab when invoking select text from menu
Diffstat (limited to 'src/com/android/browser/BrowserActivity.java')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 10 |
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: |