aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Update the enforce_system_radius_for_app_widgets flag's type" into main

Browse Source
This commit is contained in:
Shamali Patwa
2024-11-19 00:03:34 +00:00
committed by Android (Google) Code Review
parent 797b636491 d2cc1f0577
commit f05d59cdad
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
aconfig/launcher.aconfig
View File

@@ -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 {

4
src/com/android/launcher3/widget/RoundedCornerEnforcement.java
View File

@@ -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;
}

6
tests/multivalentTests/src/com/android/launcher3/widget/RoundedCornerEnforcementTest.kt
View File

@@ -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)