Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cb1b464 authored by Zak Cohen's avatar Zak Cohen Committed by Automerger Merge Worker
Browse files

Merge "Update various corner radiuses to align with AOSP apps" am: b69d6326... 

Merge "Update various corner radiuses to align with AOSP apps" am: b69d6326 am: 9f782d38 am: 92e2c8ac

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045246



Change-Id: I8da518bcdd68d7d8d142c0615c3242df45da21a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60ef7521 92e2c8ac

core/res/res/values/config.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -4425,13 +4425,13 @@ 
    <string name="config_mediaProjectionPermissionDialogComponent" translatable="false">com.android.systemui/com.android.systemui.media.MediaProjectionPermissionActivity</string>

    <string name="config_mediaProjectionPermissionDialogComponent" translatable="false">com.android.systemui/com.android.systemui.media.MediaProjectionPermissionActivity</string>





    <!-- Corner radius of system dialogs -->

    <!-- Corner radius of system dialogs -->

    <dimen name="config_dialogCornerRadius">2dp</dimen>

    <dimen name="config_dialogCornerRadius">28dp</dimen>

    <!-- Corner radius of system buttons -->

    <!-- Corner radius of system buttons -->

    <dimen name="config_buttonCornerRadius">@dimen/control_corner_material</dimen>

    <dimen name="config_buttonCornerRadius">4dp</dimen>

    <!-- Corner radius for bottom sheet system dialogs -->

    <!-- Corner radius for bottom sheet system dialogs -->

    <dimen name="config_bottomDialogCornerRadius">@dimen/config_dialogCornerRadius</dimen>

    <dimen name="config_bottomDialogCornerRadius">16dp</dimen>

    <!-- Corner radius of system progress bars -->

    <!-- Corner radius of system progress bars -->

    <dimen name="config_progressBarCornerRadius">@dimen/progress_bar_corner_material</dimen>

    <dimen name="config_progressBarCornerRadius">1000dp</dimen>

    <!-- Controls whether system buttons use all caps for text -->

    <!-- Controls whether system buttons use all caps for text -->

    <bool name="config_buttonTextAllCaps">true</bool>

    <bool name="config_buttonTextAllCaps">true</bool>

    <!-- Name of the font family used for system surfaces where the font should use medium weight -->

    <!-- Name of the font family used for system surfaces where the font should use medium weight -->

core/res/res/values/dimens.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -979,9 +979,9 @@ 
    <dimen name="controls_thumbnail_image_max_width">280dp</dimen>

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

    <!-- 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">16dp</dimen>

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

    <!-- 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">8dp</dimen>

    <dimen name="system_app_widget_inner_radius">20dp</dimen>

    <!-- System-provided padding for inner views on app widgets. The resolved value of this resource may change at runtime. @removed -->

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

    <dimen name="__removed_system_app_widget_internal_padding">16dp</dimen>