Merge "Use standard preference layout for wallpaper picker" into oc-dev

am: 8e1d588cdf

Change-Id: If8d1c3c3f8dd318e5c85393bf430a22fc07a8a89

src/com/android/settings/wallpaper/WallpaperTypeSettings.java

@@ -67,7 +67,6 @@ public class WallpaperTypeSettings extends SettingsPreferenceFragment implements
         // Add Preference items for each of the matching activities
         for (ResolveInfo info : rList) {
             Preference pref = new Preference(getPrefContext());
-            pref.setLayoutResource(R.layout.preference_wallpaper_type);
             Intent prefIntent = new Intent(intent);
             prefIntent.setComponent(new ComponentName(
                     info.activityInfo.packageName, info.activityInfo.name));