Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

widget: use system display size for widget bitmap size

Browse source 
May have introduced some variation by accident by using the smaller limit.
This commit is contained in:
Alexander Capehart 2024-08-07 17:38:51 -06:00
parent 3e4b27d76b
commit c11e03b451
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt
View file

@ -99,7 +99,7 @@ constructor(
return if (cornerRadius > 0) { return if (cornerRadius > 0) {
// If rounded, reduce the bitmap size further to obtain more pronounced // If rounded, reduce the bitmap size further to obtain more pronounced
// rounded corners. // rounded corners.
builder.size(getSafeRemoteViewsImageSize(context, 10f)) builder.size(getSafeRemoteViewsImageSize(10f))
val cornersTransformation = val cornersTransformation =
RoundedRectTransformation(cornerRadius.toFloat()) RoundedRectTransformation(cornerRadius.toFloat())
if (imageSettings.forceSquareCovers) { if (imageSettings.forceSquareCovers) {
@ -112,7 +112,7 @@ constructor(
if (imageSettings.forceSquareCovers) { if (imageSettings.forceSquareCovers) {
builder.transformations(SquareCropTransformation.INSTANCE) builder.transformations(SquareCropTransformation.INSTANCE)
} }
builder.size(getSafeRemoteViewsImageSize(context)) builder.size(getSafeRemoteViewsImageSize())
} }
} }

19
app/src/main/java/org/oxycblt/auxio/widgets/WidgetUtil.kt
View file

@ -21,6 +21,7 @@ package org.oxycblt.auxio.widgets
import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetManager
import android.content.ComponentName import android.content.ComponentName
import android.content.Context import android.content.Context
import android.content.res.Resources
import android.os.Build import android.os.Build
import android.util.SizeF import android.util.SizeF
import android.widget.RemoteViews import android.widget.RemoteViews
@ -31,6 +32,7 @@ import kotlin.math.sqrt
import org.oxycblt.auxio.util.isLandscape import org.oxycblt.auxio.util.isLandscape
import org.oxycblt.auxio.util.logD import org.oxycblt.auxio.util.logD
import org.oxycblt.auxio.util.newMainPendingIntent import org.oxycblt.auxio.util.newMainPendingIntent
import kotlin.math.min
/** /**
* Create a [RemoteViews] instance with the specified layout and an automatic click handler to open * Create a [RemoteViews] instance with the specified layout and an automatic click handler to open
@ -46,6 +48,8 @@ fun newRemoteViews(context: Context, @LayoutRes layoutRes: Int): RemoteViews {
return views return views
} }
const val MINIMUM_OBSERVED_MAX_SAFE_BITMAP_SIZE = 6912000 * 0.95f // 95% slack
/** /**
* Get an image size guaranteed to not exceed the [RemoteViews] bitmap memory limit, assuming that * Get an image size guaranteed to not exceed the [RemoteViews] bitmap memory limit, assuming that
* there is only one image. * there is only one image.
@ -55,13 +59,18 @@ fun newRemoteViews(context: Context, @LayoutRes layoutRes: Int): RemoteViews {
* device-specific variations in memory limit. * device-specific variations in memory limit.
* @return The dimension of a bitmap that can be safely used in [RemoteViews]. * @return The dimension of a bitmap that can be safely used in [RemoteViews].
*/ */
fun getSafeRemoteViewsImageSize(context: Context, reduce: Float = 2f): Int { fun getSafeRemoteViewsImageSize(reduce: Float = 2f): Int {
val metrics = context.resources.displayMetrics val metrics = Resources.getSystem().displayMetrics
val sw = metrics.widthPixels val sw = metrics.widthPixels
val sh = metrics.heightPixels val sh = metrics.heightPixels
// Maximum size is 1/3 total screen area * 4 bytes per pixel. Reverse
// that to obtain the image size. // Cap memory usage at 1.5 times the size of the display
return sqrt((6f / 4f / reduce) * sw * sh).toInt() // 1.5 * 4 bytes/pixel * w * h ==> 6 * w * h
// https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
val maxWidgetBitmapMemory = 6 * sw * sh
val maxBitmapArea = (maxWidgetBitmapMemory / 4) / reduce
val maxBitmapSize = sqrt(maxBitmapArea).toInt()
return maxBitmapSize;
} }
/** /**