summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/IntentHandler.java
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2012-01-19 13:56:00 -0800
committerMichael Kolb <kolby@google.com>2012-05-16 13:01:32 -0700
commit8d772b03fcfd83cea6ec81c9e826f700fac88b61 (patch)
tree93897866c00fd2561569af8cf5cf961cdb4db5e7 /src/com/android/browser/IntentHandler.java
parent234eadcf7d0dbf2d24f92c24f40343d518f6fe3a (diff)
downloadpackages_apps_Browser-8d772b03fcfd83cea6ec81c9e826f700fac88b61.tar.gz
packages_apps_Browser-8d772b03fcfd83cea6ec81c9e826f700fac88b61.tar.bz2
packages_apps_Browser-8d772b03fcfd83cea6ec81c9e826f700fac88b61.zip
Add setting to control tabs per app behavior
Bug: 5890701 Change-Id: I6a47c7bff260dd8ded3a4c360f186ce8f670c67e
Diffstat (limited to 'src/com/android/browser/IntentHandler.java')
-rw-r--r--src/com/android/browser/IntentHandler.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index 47cab70aa..e22c5dc91 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -139,7 +139,8 @@ public class IntentHandler {
}
if (Intent.ACTION_VIEW.equals(action)
&& !mActivity.getPackageName().equals(appId)) {
- if (!BrowserActivity.isTablet(mActivity)) {
+ if (!BrowserActivity.isTablet(mActivity)
+ && !mSettings.allowAppTabs()) {
Tab appTab = mTabControl.getTabFromAppId(appId);
if (appTab != null) {
mController.reuseTab(appTab, urlData);