Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow corner UI to decouple from rounded_corner_radius" into rvc-dev

Browse Source
This commit is contained in:
Evan Laird
2020-04-28 21:33:17 +00:00
committed by Android (Google) Code Review
parent 48f0527199 531849ab48
commit c211ed5361
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/values/dimens.xml
View File

@@ -1304,4 +1304,9 @@
<!-- Opacity at which the background for the shutdown UI will be drawn. --> <!-- Opacity at which the background for the shutdown UI will be drawn. -->
<item name="shutdown_scrim_behind_alpha" format="float" type="dimen">0.95</item> <item name="shutdown_scrim_behind_alpha" format="float" type="dimen">0.95</item>
<!-- Allow CornerHandleView and PathSpecCornerPathRenderer to decouple from corner-radius -->
<dimen name="config_rounded_mask_size">@*android:dimen/rounded_corner_radius</dimen>
<dimen name="config_rounded_mask_size_top">@*android:dimen/rounded_corner_radius_top</dimen>
<dimen name="config_rounded_mask_size_bottom">@*android:dimen/rounded_corner_radius_bottom</dimen>
</resources> </resources>

6
packages/SystemUI/src/com/android/systemui/CornerHandleView.java
View File

@@ -168,14 +168,14 @@ public class CornerHandleView extends View {
// Attempt to get the bottom corner radius, otherwise fall back on the generic or top // Attempt to get the bottom corner radius, otherwise fall back on the generic or top
// values. If none are available, use the FALLBACK_RADIUS_DP. // values. If none are available, use the FALLBACK_RADIUS_DP.
int radius = getResources().getDimensionPixelSize( int radius = getResources().getDimensionPixelSize(
com.android.internal.R.dimen.rounded_corner_radius_bottom); com.android.systemui.R.dimen.config_rounded_mask_size_bottom);
if (radius == 0) { if (radius == 0) {
radius = getResources().getDimensionPixelSize( radius = getResources().getDimensionPixelSize(
com.android.internal.R.dimen.rounded_corner_radius); com.android.systemui.R.dimen.config_rounded_mask_size);
} }
if (radius == 0) { if (radius == 0) {
radius = getResources().getDimensionPixelSize( radius = getResources().getDimensionPixelSize(
com.android.internal.R.dimen.rounded_corner_radius_top); com.android.systemui.R.dimen.config_rounded_mask_size_top);
} }
if (radius == 0) { if (radius == 0) {
radius = (int) convertDpToPixel(FALLBACK_RADIUS_DP, mContext); radius = (int) convertDpToPixel(FALLBACK_RADIUS_DP, mContext);

12
packages/SystemUI/src/com/android/systemui/assist/ui/DisplayUtils.java
View File

@@ -84,8 +84,8 @@ public class DisplayUtils {
public static int getCornerRadiusBottom(Context context) { public static int getCornerRadiusBottom(Context context) {
int radius = 0; int radius = 0;
int resourceId = context.getResources().getIdentifier("rounded_corner_radius_bottom", int resourceId = context.getResources().getIdentifier("config_rounded_mask_size_bottom",
"dimen", "android"); "dimen", "com.android.systemui");
if (resourceId > 0) { if (resourceId > 0) {
radius = context.getResources().getDimensionPixelSize(resourceId); radius = context.getResources().getDimensionPixelSize(resourceId);
} }
@@ -103,8 +103,8 @@ public class DisplayUtils {
public static int getCornerRadiusTop(Context context) { public static int getCornerRadiusTop(Context context) {
int radius = 0; int radius = 0;
int resourceId = context.getResources().getIdentifier("rounded_corner_radius_top", int resourceId = context.getResources().getIdentifier("config_rounded_mask_size_top",
"dimen", "android"); "dimen", "com.android.systemui");
if (resourceId > 0) { if (resourceId > 0) {
radius = context.getResources().getDimensionPixelSize(resourceId); radius = context.getResources().getDimensionPixelSize(resourceId);
} }
@@ -118,8 +118,8 @@ public class DisplayUtils {
private static int getCornerRadiusDefault(Context context) { private static int getCornerRadiusDefault(Context context) {
int radius = 0; int radius = 0;
int resourceId = context.getResources().getIdentifier("rounded_corner_radius", "dimen", int resourceId = context.getResources().getIdentifier("config_rounded_mask_size",
"android"); "dimen", "com.android.systemui");
if (resourceId > 0) { if (resourceId > 0) {
radius = context.getResources().getDimensionPixelSize(resourceId); radius = context.getResources().getDimensionPixelSize(resourceId);
} }

4
packages/SystemUI/src/com/android/systemui/assist/ui/PathSpecCornerPathRenderer.java
View File

@@ -45,8 +45,8 @@ public final class PathSpecCornerPathRenderer extends CornerPathRenderer {
mWidth = DisplayUtils.getWidth(context); mWidth = DisplayUtils.getWidth(context);
mHeight = DisplayUtils.getHeight(context); mHeight = DisplayUtils.getHeight(context);
mBottomCornerRadius = DisplayUtils.getCornerRadiusBottom(context); mBottomCornerRadius = DisplayUtils.getCornerRadiusBottom(context);
mTopCornerRadius = DisplayUtils.getCornerRadiusTop(context); mTopCornerRadius = DisplayUtils.getCornerRadiusTop(context);
String pathData = context.getResources().getString(R.string.config_rounded_mask); String pathData = context.getResources().getString(R.string.config_rounded_mask);
Path path = PathParser.createPathFromPathData(pathData); Path path = PathParser.createPathFromPathData(pathData);