commit 3bf59298765b441ba3cd26f0731253962c190387
author Ben Murdoch <benm@android.com> Thu Dec 11 19:13:49 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 11 19:13:51 2014 +0000
tree 2471efa165900af151ec071d0c39f51e65c47199
parent 5baac25e0601e9894ee6fc690a9f6d0f534af4a2
parent 0184f3391b86ce36d74455e3c87d77d32b3c1fc8

Merge "Implement BrowserPreferencePage.isValidFragment."

src/com/android/browser/BrowserPreferencesPage.java

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.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 @@
         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);
+
+    }
 }