diff options
author | Ben Murdoch <benm@android.com> | 2014-12-11 19:13:49 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-11 19:13:51 +0000 |
commit | 3bf59298765b441ba3cd26f0731253962c190387 (patch) | |
tree | 2471efa165900af151ec071d0c39f51e65c47199 /src/com/android | |
parent | 5baac25e0601e9894ee6fc690a9f6d0f534af4a2 (diff) | |
parent | 0184f3391b86ce36d74455e3c87d77d32b3c1fc8 (diff) | |
download | packages_apps_Browser-3bf59298765b441ba3cd26f0731253962c190387.zip packages_apps_Browser-3bf59298765b441ba3cd26f0731253962c190387.tar.gz packages_apps_Browser-3bf59298765b441ba3cd26f0731253962c190387.tar.bz2 |
Merge "Implement BrowserPreferencePage.isValidFragment."
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/browser/BrowserPreferencesPage.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java index 6e6da17..323b9b8 100644 --- a/src/com/android/browser/BrowserPreferencesPage.java +++ b/src/com/android/browser/BrowserPreferencesPage.java @@ -22,8 +22,14 @@ import android.os.Bundle; import android.preference.PreferenceActivity; import android.view.MenuItem; +import com.android.browser.preferences.AccessibilityPreferencesFragment; +import com.android.browser.preferences.AdvancedPreferencesFragment; import com.android.browser.preferences.BandwidthPreferencesFragment; import com.android.browser.preferences.DebugPreferencesFragment; +import com.android.browser.preferences.GeneralPreferencesFragment; +import com.android.browser.preferences.LabPreferencesFragment; +import com.android.browser.preferences.PrivacySecurityPreferencesFragment; +import com.android.browser.preferences.WebsiteSettingsFragment; import java.util.List; @@ -98,4 +104,16 @@ public class BrowserPreferencesPage extends PreferenceActivity { return intent; } + @Override + protected boolean isValidFragment(String fragmentName) { + return AccessibilityPreferencesFragment.class.getName().equals(fragmentName) || + AdvancedPreferencesFragment.class.getName().equals(fragmentName) || + BandwidthPreferencesFragment.class.getName().equals(fragmentName) || + DebugPreferencesFragment.class.getName().equals(fragmentName) || + GeneralPreferencesFragment.class.getName().equals(fragmentName) || + LabPreferencesFragment.class.getName().equals(fragmentName) || + PrivacySecurityPreferencesFragment.class.getName().equals(fragmentName) || + WebsiteSettingsFragment.class.getName().equals(fragmentName); + + } } |