Merge branch '2846-t-dockblurfix' into 'v1-t' (2d48d28d) · Commits · e / os / BlissLauncher3

bliss/src/foundation/e/bliss/blur/BlurWallpaperProvider.kt

+14 −8

Original line number	Diff line number	Diff line
		@@ -174,14 +174,20 @@ class BlurWallpaperProvider(val context: Context) {
		mVibrancyPaint.colorFilter =
		ColorMatrixColorFilter(ColorMatrix().apply { setSaturation(1.25f) })

		val bitmap =
		Bitmap.createBitmap(
		val origBitmap = Bitmap.createBitmap(wallpaper)
		val bitmap = origBitmap.copy(Bitmap.Config.ARGB_8888, true)
		Canvas().apply {
		try {
		setBitmap(bitmap)
		} catch (e: IllegalStateException) {
		Logger.e(TAG, "Failed to set bitmap, using fallback", e)
		val newBitmap = Bitmap.createBitmap(
		wallpaper.width,
		wallpaper.height,
		wallpaper.config ?: Bitmap.Config.ARGB_8888
		)
		Canvas().apply {
		setBitmap(bitmap)
		setBitmap(newBitmap)
		}
		drawBitmap(wallpaper, 0f, 0f, mVibrancyPaint)
		}

		@@ -284,7 +290,7 @@ class BlurWallpaperProvider(val context: Context) {

		@JvmField val blurConfigBackground = BlurConfig({ it.background }, 2, 8)

		@JvmField val blurConfigDock = BlurConfig({ it.dock }, 2, 8)
		@JvmField val blurConfigDock = BlurConfig({ it.dock }, 2, 2)

		@JvmField val blurConfigAppGroup = BlurConfig({ it.appGroup }, 6, 8)

+3 −0

Original line number	Diff line number	Diff line
		@@ -619,6 +619,9 @@ public class Launcher extends StatefulActivity<LauncherState>
		getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
		}
		setTitle(R.string.home_screen);
		if (!mDeviceProfile.isTablet) {
		getWindow().setNavigationBarColor(getWindow().getNavigationBarColor() \| 0x26000000);
		}
		}

		/**