Merge "Fix boot time regression on Wembley" into sc-dev (d96ed76d) · Commits · e / os / android_frameworks_base

core/java/android/app/WallpaperColors.java

+15 −5

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ import android.util.Size;
	import com.android.internal.graphics.ColorUtils;		import com.android.internal.graphics.ColorUtils;
	import com.android.internal.graphics.palette.CelebiQuantizer;		import com.android.internal.graphics.palette.CelebiQuantizer;
	import com.android.internal.graphics.palette.Palette;		import com.android.internal.graphics.palette.Palette;
			import com.android.internal.graphics.palette.VariationalKMeansQuantizer;
	import com.android.internal.util.ContrastColorUtil;		import com.android.internal.util.ContrastColorUtil;

	import java.io.FileOutputStream;		import java.io.FileOutputStream;
	@@ -178,11 +179,20 @@ public final class WallpaperColors implements Parcelable {
	optimalSize.getHeight(), true /* filter */);		optimalSize.getHeight(), true /* filter */);
	}		}

	final Palette palette = Palette		final Palette palette;
			if (ActivityManager.isLowRamDeviceStatic()) {
			palette = Palette
			.from(bitmap, new VariationalKMeansQuantizer())
			.maximumColorCount(5)
			.resizeBitmapArea(MAX_WALLPAPER_EXTRACTION_AREA)
			.generate();
			} else {
			palette = Palette
	.from(bitmap, new CelebiQuantizer())		.from(bitmap, new CelebiQuantizer())
	.maximumColorCount(256)		.maximumColorCount(256)
	.resizeBitmapArea(MAX_WALLPAPER_EXTRACTION_AREA)		.resizeBitmapArea(MAX_WALLPAPER_EXTRACTION_AREA)
	.generate();		.generate();
			}
	// Remove insignificant colors and sort swatches by population		// Remove insignificant colors and sort swatches by population
	final ArrayList<Palette.Swatch> swatches = new ArrayList<>(palette.getSwatches());		final ArrayList<Palette.Swatch> swatches = new ArrayList<>(palette.getSwatches());
	swatches.sort((a, b) -> b.getPopulation() - a.getPopulation());		swatches.sort((a, b) -> b.getPopulation() - a.getPopulation());