From d2cc1f057736fa7b5f4e83bc3d8e277fd84ff032 Mon Sep 17 00:00:00 2001 From: Shamali Patwa Date: Mon, 18 Nov 2024 20:18:17 +0000 Subject: [PATCH] Update the enforce_system_radius_for_app_widgets flag's type Renamed to use_system_radius_for_app_widgets since metadata cannot be updated after submitting definition. Bug: 373351337 Test: N/A flag metadata update Change-Id: I25283b05341517f5984b0f2fc0d27efe8027a3de Flag: com.android.launcher3.use_system_radius_for_app_widgets --- aconfig/launcher.aconfig | 9 ++++++--- .../launcher3/widget/RoundedCornerEnforcement.java | 4 ++-- .../launcher3/widget/RoundedCornerEnforcementTest.kt | 6 +++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig index 1856b39372..4ff976d148 100644 --- a/aconfig/launcher.aconfig +++ b/aconfig/launcher.aconfig @@ -501,10 +501,13 @@ flag { } flag { - name: "enforce_system_radius_for_app_widgets" + name: "use_system_radius_for_app_widgets" namespace: "launcher" - description: "Enforce system radius for widget corners instead of a separate 16.dp value" - bug: "370950552" + description: "Use system radius for enforced widget corners instead of a separate 16.dp value" + bug: "373351337" + metadata { + purpose: PURPOSE_BUGFIX + } } flag { diff --git a/src/com/android/launcher3/widget/RoundedCornerEnforcement.java b/src/com/android/launcher3/widget/RoundedCornerEnforcement.java index e190dc3749..2c07fd9ad1 100644 --- a/src/com/android/launcher3/widget/RoundedCornerEnforcement.java +++ b/src/com/android/launcher3/widget/RoundedCornerEnforcement.java @@ -16,7 +16,7 @@ package com.android.launcher3.widget; -import static com.android.launcher3.Flags.enforceSystemRadiusForAppWidgets; +import static com.android.launcher3.Flags.useSystemRadiusForAppWidgets; import android.appwidget.AppWidgetHostView; import android.content.Context; @@ -99,7 +99,7 @@ public class RoundedCornerEnforcement { public static float computeEnforcedRadius(@NonNull Context context) { Resources res = context.getResources(); float systemRadius = res.getDimension(android.R.dimen.system_app_widget_background_radius); - if (enforceSystemRadiusForAppWidgets()) { + if (useSystemRadiusForAppWidgets()) { return systemRadius; } diff --git a/tests/multivalentTests/src/com/android/launcher3/widget/RoundedCornerEnforcementTest.kt b/tests/multivalentTests/src/com/android/launcher3/widget/RoundedCornerEnforcementTest.kt index c82e84c18a..13e23c9753 100644 --- a/tests/multivalentTests/src/com/android/launcher3/widget/RoundedCornerEnforcementTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/widget/RoundedCornerEnforcementTest.kt @@ -86,7 +86,7 @@ class RoundedCornerEnforcementTest { } @Test - @DisableFlags(Flags.FLAG_ENFORCE_SYSTEM_RADIUS_FOR_APP_WIDGETS) + @DisableFlags(Flags.FLAG_USE_SYSTEM_RADIUS_FOR_APP_WIDGETS) fun `Compute system radius when smaller`() { val mockContext = mock(Context::class.java) val mockRes = mock(Resources::class.java) @@ -103,7 +103,7 @@ class RoundedCornerEnforcementTest { } @Test - @DisableFlags(Flags.FLAG_ENFORCE_SYSTEM_RADIUS_FOR_APP_WIDGETS) + @DisableFlags(Flags.FLAG_USE_SYSTEM_RADIUS_FOR_APP_WIDGETS) fun `Compute launcher radius when smaller`() { val mockContext = mock(Context::class.java) val mockRes = mock(Resources::class.java) @@ -120,7 +120,7 @@ class RoundedCornerEnforcementTest { } @Test - @EnableFlags(Flags.FLAG_ENFORCE_SYSTEM_RADIUS_FOR_APP_WIDGETS) + @EnableFlags(Flags.FLAG_USE_SYSTEM_RADIUS_FOR_APP_WIDGETS) fun `Compute system radius ignoring launcher radius`() { val mockContext = mock(Context::class.java) val mockRes = mock(Resources::class.java)