Merge branch 'marshmallow-x86_wo_su' into cm-13.0-x86

Conflicts:
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java

diff --cc res/xml/dashboard_categories.xml
index 4520ee0,f46a820..aa894db
--- 1/res/xml/dashboard_categories.xml
--- 2/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@@ -135,27 -102,30 +135,35 @@@
                  android:icon="@drawable/ic_settings_notifications"
                  />
  
 -        <!-- Application Settings -->
 +        <!-- Lock screen -->
          <dashboard-tile
 -                android:id="@+id/application_settings"
 -                android:title="@string/applications_settings"
 -                android:fragment="com.android.settings.applications.ManageApplications"
 -                android:icon="@drawable/ic_settings_applications"
 -                />
 +                android:id="@+id/lockscreen_settings"
 +                android:title="@string/lockscreen_settings"
 +                android:fragment="com.android.settings.SecuritySettings"
 +                android:icon="@drawable/ic_settings_lockscreen">
 +                <extra android:name="filter_type" android:value="0" />
 +        </dashboard-tile>
 +
 +        <!-- Buttons -->
  
+         <!-- Apps Compatibility -->
+         <dashboard-tile
+                 android:id="@+id/apps_compatibility_settings"
+                 android:title="@string/apps_compatibility_title"
+                 android:fragment="com.android.settings.AppsCompatibility"
+                 android:icon="@drawable/ic_settings_applications"
+                 />
+ 
          <!-- Storage -->
          <dashboard-tile
 -                android:id="@+id/storage_settings"
 -                android:title="@string/storage_usb_settings"
 -                android:fragment="com.android.settings.deviceinfo.StorageSettings"
 -                android:icon="@drawable/ic_settings_storage"
 +                android:id="@+id/button_settings"
 +                android:title="@string/button_pref_title"
 +                android:fragment="com.android.settings.ButtonSettings"
 +                android:icon="@drawable/ic_settings_buttons"
                  />
  
 +        <external-tiles />
 +
          <!-- Battery -->
          <dashboard-tile
                  android:id="@+id/battery_settings"