Merge "Allow corner UI to decouple from rounded_corner_radius" into rvc-dev... (51d6d553) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/dimens.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -1304,4 +1304,9 @@

		<!-- 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>

		<!-- 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>

+3 −3

Original line number	Diff line number	Diff line
		@@ -168,14 +168,14 @@ public class CornerHandleView extends View {
		// 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.
		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) {
		radius = getResources().getDimensionPixelSize(
		com.android.internal.R.dimen.rounded_corner_radius);
		com.android.systemui.R.dimen.config_rounded_mask_size);
		}
		if (radius == 0) {
		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) {
		radius = (int) convertDpToPixel(FALLBACK_RADIUS_DP, mContext);

+6 −6

Original line number	Diff line number	Diff line
		@@ -84,8 +84,8 @@ public class DisplayUtils {
		public static int getCornerRadiusBottom(Context context) {
		int radius = 0;

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

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

		int resourceId = context.getResources().getIdentifier("rounded_corner_radius", "dimen",
		"android");
		int resourceId = context.getResources().getIdentifier("config_rounded_mask_size",
		"dimen", "com.android.systemui");
		if (resourceId > 0) {
		radius = context.getResources().getDimensionPixelSize(resourceId);
		}

+2 −2

File changed.

Contains only whitespace changes.