Merge "Reduce number of wallpaper results in search." into oc-dr1-dev am: 63c63ff640

am: 301dfdd8d1

Change-Id: Iab4d5c24b9ac7cee39af3bcc14631fa09bb455c5

diff --cc src/com/android/settings/DisplaySettings.java
Simple merge

diff --cc src/com/android/settings/display/WallpaperPreferenceController.java
index 1c26440,eb91052..fe76ae1
--- 1/src/com/android/settings/display/WallpaperPreferenceController.java
--- 2/src/com/android/settings/display/WallpaperPreferenceController.java
+++ b/src/com/android/settings/display/WallpaperPreferenceController.java
@@@ -24,10 -23,9 +24,10 @@@ import com.android.settingslib.core.Abs
  
  import static android.os.UserManager.DISALLOW_SET_WALLPAPER;
  
 -public class WallpaperPreferenceController extends PreferenceController {
 +public class WallpaperPreferenceController extends AbstractPreferenceController implements
 +        PreferenceControllerMixin {
  
-     private static final String KEY_WALLPAPER = "wallpaper";
+     public static final String KEY_WALLPAPER = "wallpaper";
  
      public WallpaperPreferenceController(Context context) {
          super(context);