Settings cleanup

 Bug: 3259885
 Cleans up the grouping of the settings and adds categories

Change-Id: I13666b36d8d55e0d9e17a732b5911a28a1223666
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 1b8acc6..267056e 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -739,10 +739,8 @@
         reset();
         SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(ctx);
         p.edit().clear().apply();
-        PreferenceManager.setDefaultValues(ctx, R.xml.page_content_preferences, true);
-        PreferenceManager.setDefaultValues(ctx, R.xml.personal_preferences, true);
-        PreferenceManager.setDefaultValues(ctx, R.xml.privacy_preferences, true);
-        PreferenceManager.setDefaultValues(ctx, R.xml.security_preferences, true);
+        PreferenceManager.setDefaultValues(ctx, R.xml.general_preferences, true);
+        PreferenceManager.setDefaultValues(ctx, R.xml.privacy_security_preferences, true);
         PreferenceManager.setDefaultValues(ctx, R.xml.advanced_preferences, true);
         // reset homeUrl
         setHomePage(ctx, getFactoryResetHomeUrl(ctx));