diff options
| author | Michael Kolb <kolby@google.com> | 2011-03-14 15:19:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 15:19:32 -0700 |
| commit | 77788fef6c07294a2d49134c0b77a2b7b55b8593 (patch) | |
| tree | c94c78389e75f3c9efe4142749b937e8ad3641ef | |
| parent | a41e924e2544643357dd3d883d6a4cd3bf84f4d5 (diff) | |
| parent | e48594a7fef0f803a801a2655d469e46739ec457 (diff) | |
| download | android_packages_apps_Gello-77788fef6c07294a2d49134c0b77a2b7b55b8593.tar.gz android_packages_apps_Gello-77788fef6c07294a2d49134c0b77a2b7b55b8593.tar.bz2 android_packages_apps_Gello-77788fef6c07294a2d49134c0b77a2b7b55b8593.zip | |
am e48594a7: Merge "change app tab behavior" into honeycomb-mr1
* commit 'e48594a7fef0f803a801a2655d469e46739ec457':
change app tab behavior
| -rw-r--r-- | src/com/android/browser/IntentHandler.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java index 77db5384..fa8bfbc2 100644 --- a/src/com/android/browser/IntentHandler.java +++ b/src/com/android/browser/IntentHandler.java @@ -145,14 +145,18 @@ public class IntentHandler { || (activateVoiceSearch && appId != null)) && !mActivity.getPackageName().equals(appId) && (flags & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) { - Tab appTab = mTabControl.getTabFromId(appId); - if (appTab != null) { - mController.reuseTab(appTab, appId, urlData); - return; + if (activateVoiceSearch) { + Tab appTab = mTabControl.getTabFromId(appId); + if (appTab != null) { + mController.reuseTab(appTab, appId, urlData); + return; + } else { + mController.openTabAndShow(null, urlData, false, appId); + } } else { // No matching application tab, try to find a regular tab // with a matching url. - appTab = mTabControl.findUnusedTabWithUrl(urlData.mUrl); + Tab appTab = mTabControl.findUnusedTabWithUrl(urlData.mUrl); if (appTab != null) { if (current != appTab) { mController.switchToTab(mTabControl.getTabIndex(appTab)); @@ -164,7 +168,7 @@ public class IntentHandler { // MAX_TABS. Then the url will be opened in the current // tab. If a new tab is created, it will have "true" for // exit on close. - mController.openTabAndShow(null, urlData, true, appId); + mController.openTabAndShow(null, urlData, false, appId); } } } else { |