diff options
| -rw-r--r-- | src/com/android/browser/BrowserPreferencesPage.java | 15 | ||||
| -rw-r--r-- | src/com/android/browser/UrlHandler.java | 5 |
2 files changed, 5 insertions, 15 deletions
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java index 9b538e0..6e6da17 100644 --- a/src/com/android/browser/BrowserPreferencesPage.java +++ b/src/com/android/browser/BrowserPreferencesPage.java @@ -25,10 +25,7 @@ import android.view.MenuItem; import com.android.browser.preferences.BandwidthPreferencesFragment; import com.android.browser.preferences.DebugPreferencesFragment; -import java.util.Arrays; -import java.util.HashSet; import java.util.List; -import java.util.Set; public class BrowserPreferencesPage extends PreferenceActivity { @@ -101,16 +98,4 @@ public class BrowserPreferencesPage extends PreferenceActivity { return intent; } - private static final Set<String> sKnownFragments = new HashSet<String>(Arrays.asList( - "com.android.browser.preferences.GeneralPreferencesFragment", - "com.android.browser.preferences.PrivacySecurityPreferencesFragment", - "com.android.browser.preferences.AccessibilityPreferencesFragment", - "com.android.browser.preferences.AdvancedPreferencesFragment", - "com.android.browser.preferences.BandwidthPreferencesFragment", - "com.android.browser.preferences.LabPreferencesFragment")); - - @Override - protected boolean isValidFragment(String fragmentName) { - return sKnownFragments.contains(fragmentName); - } } diff --git a/src/com/android/browser/UrlHandler.java b/src/com/android/browser/UrlHandler.java index 167d410..e21e3e8 100644 --- a/src/com/android/browser/UrlHandler.java +++ b/src/com/android/browser/UrlHandler.java @@ -160,6 +160,11 @@ public class UrlHandler { // security (only access to BROWSABLE activities). intent.addCategory(Intent.CATEGORY_BROWSABLE); intent.setComponent(null); + Intent selector = intent.getSelector(); + if (selector != null) { + selector.addCategory(Intent.CATEGORY_BROWSABLE); + selector.setComponent(null); + } // Re-use the existing tab if the intent comes back to us if (tab != null) { if (tab.getAppId() == null) { |