Merge tag 'android-6.0.1_r66' into marshmallow-x86

[android-x86/packages-apps-Settings.git] / src / com / android / settings / SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 39c0e90..d41b572 100644 (file)
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -265,6 +265,7 @@ public class SettingsActivity extends Activity
             R.id.display_settings,
             R.id.storage_settings,
             R.id.application_settings,
+            R.id.apps_compatibility_settings,
             R.id.battery_settings,
             R.id.personal_section,
             R.id.location_settings,
@@ -302,6 +303,7 @@ public class SettingsActivity extends Activity
             DisplaySettings.class.getName(),
             DeviceInfoSettings.class.getName(),
             ManageApplications.class.getName(),
+            AppsCompatibility.class.getName(),
             ManageAssist.class.getName(),
             ProcessStatsUi.class.getName(),
             NotificationStation.class.getName(),
@@ -1295,6 +1297,10 @@ public class SettingsActivity extends Activity
                     if (!hasPrintingSupport) {
                         removeTile = true;
                     }
+                } else if (id == R.id.superuser_settings) {
+                    if (!DevelopmentSettings.isRootForAppsEnabled()) {
+                        removeTile = true;
+                    }
                 } else if (id == R.id.development_settings) {
                     if (!showDev || um.hasUserRestriction(
                             UserManager.DISALLOW_DEBUGGING_FEATURES)) {