Merge "Implement BrowserPreferencePage.isValidFragment."android-wear-5.0.0_r1lollipop-wear-release

1 files changed, 18 insertions, 0 deletions

diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index 6e6da178..323b9b8c 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);
+
+    }
 }