Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63c63ff6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reduce number of wallpaper results in search." into oc-dr1-dev

parents 864d5c96 ebaab6aa

src/com/android/settings/DisplaySettings.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -127,6 +127,7 @@ public class DisplaySettings extends DashboardFragment { 
                public List<String> getNonIndexableKeys(Context context) {

                public List<String> getNonIndexableKeys(Context context) {

                    List<String> keys = super.getNonIndexableKeys(context);

                    List<String> keys = super.getNonIndexableKeys(context);

                    keys.add(KEY_DISPLAY_SIZE);

                    keys.add(KEY_DISPLAY_SIZE);

                    keys.add(WallpaperPreferenceController.KEY_WALLPAPER);

                    return keys;

                    return keys;

                }

                }

src/com/android/settings/display/WallpaperPreferenceController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ import static android.os.UserManager.DISALLOW_SET_WALLPAPER; 




public class WallpaperPreferenceController extends PreferenceController {

public class WallpaperPreferenceController extends PreferenceController {





    private static final String KEY_WALLPAPER = "wallpaper";

    public static final String KEY_WALLPAPER = "wallpaper";





    public WallpaperPreferenceController(Context context) {

    public WallpaperPreferenceController(Context context) {

        super(context);

        super(context);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ public class WallpaperSuggestionActivity extends Activity { 
        finish();

        finish();

    }

    }





    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

    @VisibleForTesting

    void startFallbackSuggestion() {

    void startFallbackSuggestion() {

        // fall back to default wallpaper picker

        // fall back to default wallpaper picker

        Utils.startWithFragment(this, WallpaperTypeSettings.class.getName(), null, null, 0,

        Utils.startWithFragment(this, WallpaperTypeSettings.class.getName(), null, null, 0,

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -90,8 +90,13 @@ public class WallpaperTypeSettings extends SettingsPreferenceFragment implements 
                final List<ResolveInfo> rList = pm.queryIntentActivities(intent,

                final List<ResolveInfo> rList = pm.queryIntentActivities(intent,

                        PackageManager.MATCH_DEFAULT_ONLY);

                        PackageManager.MATCH_DEFAULT_ONLY);





                // Add indexable data for each of the matching activities

                // Add indexable data for package that is in config_wallpaper_picker_package

                final String wallpaperPickerPackage =

                        context.getString(R.string.config_wallpaper_picker_package);

                for (ResolveInfo info : rList) {

                for (ResolveInfo info : rList) {

                    if (!wallpaperPickerPackage.equals(info.activityInfo.packageName)) {

                        continue;

                    }

                    CharSequence label = info.loadLabel(pm);

                    CharSequence label = info.loadLabel(pm);

                    if (label == null) label = info.activityInfo.packageName;

                    if (label == null) label = info.activityInfo.packageName;