diff options
| author | Ben Murdoch <benm@android.com> | 2014-12-11 19:35:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 19:35:40 +0000 |
| commit | 3a815d477f5a23af1e96a6b24e546e1506ab7bb2 (patch) | |
| tree | a8290ae4448e8cfa20bf6b3e8af2db290e5da2fd /src/com/android/browser | |
| parent | 12504199716c0b906c88769c19fc1734858e7a41 (diff) | |
| parent | fb8f3a9079d288f508338cd3df2eb7c872bb4fc0 (diff) | |
| download | packages_apps_Browser-3a815d477f5a23af1e96a6b24e546e1506ab7bb2.zip packages_apps_Browser-3a815d477f5a23af1e96a6b24e546e1506ab7bb2.tar.gz packages_apps_Browser-3a815d477f5a23af1e96a6b24e546e1506ab7bb2.tar.bz2 | |
am fb8f3a90: am 3bf59298: Merge "Implement BrowserPreferencePage.isValidFragment."
* commit 'fb8f3a9079d288f508338cd3df2eb7c872bb4fc0':
Implement BrowserPreferencePage.isValidFragment.
Diffstat (limited to 'src/com/android/browser')
| -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); + + } } |