summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shamali Patwa <shamalip@google.com> 2024-10-23 14:42:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-23 14:42:27 +0000
commitfc9a1b9d2c8d032f80f1bd936c05aac975b39e86 (patch)
tree93bde64530409cc925e9abb41a5d8d11b01c0e25
parentf4bef4704f8b4e41fbc8499412dbf36dba1ffb13 (diff)
parent2e28de1c2d02dd4085fb68936273e4e415288985 (diff)
Merge "Add flag for changing the system appwidget corner radius" into main
-rw-r--r--core/java/android/appwidget/flags.aconfig9
-rw-r--r--core/res/Android.bp1
-rw-r--r--core/res/res/values/dimens.xml11
3 files changed, 17 insertions, 4 deletions
diff --git a/core/java/android/appwidget/flags.aconfig b/core/java/android/appwidget/flags.aconfig
index ac9263c2cab5..3839b5fa2599 100644
--- a/core/java/android/appwidget/flags.aconfig
+++ b/core/java/android/appwidget/flags.aconfig
@@ -74,3 +74,12 @@ flag {
purpose: PURPOSE_BUGFIX
}
}
+
+flag {
+ name: "use_smaller_app_widget_radius"
+ namespace: "app_widgets"
+ description: "Updates system corner radius for app widgets to 24.dp instead of 28.dp"
+ bug: "373351337"
+ is_exported: true
+ is_fixed_read_only: true
+}
diff --git a/core/res/Android.bp b/core/res/Android.bp
index bfa1fb234bc5..f6ca8218926c 100644
--- a/core/res/Android.bp
+++ b/core/res/Android.bp
@@ -158,6 +158,7 @@ android_app {
flags_packages: [
"android.app.appfunctions.flags-aconfig",
"android.app.contextualsearch.flags-aconfig",
+ "android.appwidget.flags-aconfig",
"android.content.pm.flags-aconfig",
"android.provider.flags-aconfig",
"camera_platform_flags",
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 7184d9a8c890..522dcfaf4729 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -17,7 +17,7 @@
** limitations under the License.
*/
-->
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- The width that is used when creating thumbnails of applications. -->
<dimen name="thumbnail_width">192dp</dimen>
<!-- The height that is used when creating thumbnails of applications. -->
@@ -1037,9 +1037,12 @@
<dimen name="controls_thumbnail_image_max_width">280dp</dimen>
<!-- System-provided radius for the background view of app widgets. The resolved value of this resource may change at runtime. -->
- <dimen name="system_app_widget_background_radius">28dp</dimen>
- <!-- System-provided radius for inner views on app widgets. The resolved value of this resource may change at runtime. -->
- <dimen name="system_app_widget_inner_radius">20dp</dimen>
+ <dimen name="system_app_widget_background_radius" android:featureFlag="!android.appwidget.flags.use_smaller_app_widget_radius">28dp</dimen>
+ <dimen name="system_app_widget_background_radius" android:featureFlag="android.appwidget.flags.use_smaller_app_widget_radius">24dp</dimen>
+ <!-- System-provided radius for inner views on app widgets that are positioned 8dp within the widget background view. The resolved value of this resource may change at runtime. -->
+ <dimen name="system_app_widget_inner_radius" android:featureFlag="!android.appwidget.flags.use_smaller_app_widget_radius">20dp</dimen>
+ <!-- System-provided radius for inner views on app widgets that are positioned 8dp within the widget background view. The resolved value of this resource may change at runtime. -->
+ <dimen name="system_app_widget_inner_radius" android:featureFlag="android.appwidget.flags.use_smaller_app_widget_radius">16dp</dimen>
<!-- System-provided padding for inner views on app widgets. The resolved value of this resource may change at runtime. @removed -->
<dimen name="__removed_system_app_widget_internal_padding">16dp</dimen>