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

Commit 302a0344 authored by Kshitij's avatar Kshitij
Browse files

Merge branch '2846-a14-dockblurfix' into 'a14'

Make blur follow existing A12 style

See merge request e/os/BlissLauncher3!100
parents 6b764275 06e96b86
Loading
Loading
Loading
Loading
Loading
+14 −8
Original line number Diff line number Diff line
@@ -184,14 +184,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)
        }

@@ -294,7 +300,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
@@ -632,6 +632,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);
        }
        mStartupLatencyLogger.logEnd(LAUNCHER_LATENCY_STARTUP_ACTIVITY_ON_CREATE);

        if (com.android.launcher3.Flags.enableTwoPaneLauncherSettings()) {