From 8d772b03fcfd83cea6ec81c9e826f700fac88b61 Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Thu, 19 Jan 2012 13:56:00 -0800 Subject: Add setting to control tabs per app behavior Bug: 5890701 Change-Id: I6a47c7bff260dd8ded3a4c360f186ce8f670c67e --- src/com/android/browser/BrowserSettings.java | 4 ++++ src/com/android/browser/IntentHandler.java | 3 ++- src/com/android/browser/PreferenceKeys.java | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 0b7e87a..8dfd4d7 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -652,6 +652,10 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, return mPrefs.getString(PREF_SEARCH_ENGINE, SearchEngine.GOOGLE); } + public boolean allowAppTabs() { + return mPrefs.getBoolean(PREF_ALLOW_APP_TABS, false); + } + public boolean openInBackground() { return mPrefs.getBoolean(PREF_OPEN_IN_BACKGROUND, false); } diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java index 47cab70..e22c5dc 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); diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java index ff42aaf..1828032 100644 --- a/src/com/android/browser/PreferenceKeys.java +++ b/src/com/android/browser/PreferenceKeys.java @@ -46,6 +46,7 @@ public interface PreferenceKeys { static final String PREF_RESET_DEFAULT_PREFERENCES = "reset_default_preferences"; static final String PREF_SEARCH_ENGINE = "search_engine"; static final String PREF_WEBSITE_SETTINGS = "website_settings"; + static final String PREF_ALLOW_APP_TABS = "allow_apptabs"; // ---------------------- // Keys for debug_preferences.xml -- cgit v1.1