Merge "Fix rounded corners for shortcut & generated preview shadow box" into sc-dev
This commit is contained in:
@@ -98,12 +98,17 @@ public class DatabaseWidgetPreviewLoader implements WidgetPreviewLoader {
|
|||||||
private final IconCache mIconCache;
|
private final IconCache mIconCache;
|
||||||
private final UserCache mUserCache;
|
private final UserCache mUserCache;
|
||||||
private final CacheDb mDb;
|
private final CacheDb mDb;
|
||||||
|
private final float mPreviewBoxCornerRadius;
|
||||||
|
|
||||||
public DatabaseWidgetPreviewLoader(Context context, IconCache iconCache) {
|
public DatabaseWidgetPreviewLoader(Context context, IconCache iconCache) {
|
||||||
mContext = context;
|
mContext = context;
|
||||||
mIconCache = iconCache;
|
mIconCache = iconCache;
|
||||||
mUserCache = UserCache.INSTANCE.get(context);
|
mUserCache = UserCache.INSTANCE.get(context);
|
||||||
mDb = new CacheDb(context);
|
mDb = new CacheDb(context);
|
||||||
|
float previewCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(context);
|
||||||
|
mPreviewBoxCornerRadius = previewCornerRadius > 0
|
||||||
|
? previewCornerRadius
|
||||||
|
: mContext.getResources().getDimension(R.dimen.widget_preview_corner_radius);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -521,7 +526,7 @@ public class DatabaseWidgetPreviewLoader implements WidgetPreviewLoader {
|
|||||||
|
|
||||||
ShadowGenerator.Builder builder = new ShadowGenerator.Builder(Color.WHITE);
|
ShadowGenerator.Builder builder = new ShadowGenerator.Builder(Color.WHITE);
|
||||||
builder.shadowBlur = res.getDimension(R.dimen.widget_preview_shadow_blur);
|
builder.shadowBlur = res.getDimension(R.dimen.widget_preview_shadow_blur);
|
||||||
builder.radius = res.getDimension(R.dimen.widget_preview_corner_radius);
|
builder.radius = mPreviewBoxCornerRadius;
|
||||||
builder.keyShadowDistance = res.getDimension(R.dimen.widget_preview_key_shadow_distance);
|
builder.keyShadowDistance = res.getDimension(R.dimen.widget_preview_key_shadow_distance);
|
||||||
|
|
||||||
builder.bounds.set(builder.shadowBlur, builder.shadowBlur,
|
builder.bounds.set(builder.shadowBlur, builder.shadowBlur,
|
||||||
|
|||||||
Reference in New Issue
Block a user