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

Commit 4431b684 authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

Merge "Adjust usages of cross-window blur to new radius" into sc-dev am: cfe3a64c am: 17836aba 

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

Change-Id: I560c097c3018456930d9f282fd00169b4a943223
parents ead6e846 17836aba

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -4804,7 +4804,7 @@ 


    <!-- Blur radius for the Option 3 in R.integer.config_letterboxBackgroundType. Values < 0 are

        ignored and 0 is used. -->

    <dimen name="config_letterboxBackgroundWallpaperBlurRadius">100dp</dimen>

    <dimen name="config_letterboxBackgroundWallpaperBlurRadius">31dp</dimen>



    <!-- Alpha of a black translucent scrim showed over wallpaper letterbox background when

        the Option 3 is selected for R.integer.config_letterboxBackgroundType.

packages/SystemUI/res/values-land-television/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
  <dimen name="volume_dialog_panel_transparent_padding">24dp</dimen>

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

  <dimen name="volume_dialog_slider_corner_radius">@dimen/volume_dialog_slider_width</dimen>

  <dimen name="volume_dialog_background_blur_radius">100dp</dimen>

  <dimen name="volume_dialog_background_blur_radius">31dp</dimen>

  <dimen name="volume_tool_tip_right_margin">136dp</dimen>



  <dimen name="tv_volume_dialog_bubble_size">36dp</dimen>

packages/SystemUI/res/values-television/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


    <dimen name="bottom_sheet_min_height">208dp</dimen>

    <dimen name="bottom_sheet_margin">24dp</dimen>

    <dimen name="bottom_sheet_background_blur_radius">120dp</dimen>

    <dimen name="bottom_sheet_background_blur_radius">37dp</dimen>



    <dimen name="privacy_chip_margin">12dp</dimen>

    <dimen name="privacy_chip_icon_margin_in_between">9dp</dimen>

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ 


    <!--  Blur radius on status bar window and power menu  -->

    <dimen name="min_window_blur_radius">1px</dimen>

    <dimen name="max_window_blur_radius">72px</dimen>

    <dimen name="max_window_blur_radius">23px</dimen>



    <!-- How much into a DisplayCutout's bounds we can go, on each side -->

    <dimen name="display_cutout_margin_consumption">0px</dimen>

packages/SystemUI/res/values/dimens_tv.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 
  -->

<resources>

    <dimen name="tv_notification_panel_width">360dp</dimen>

    <dimen name="tv_notification_blur_radius">100dp</dimen>

    <dimen name="tv_notification_blur_radius">31dp</dimen>

</resources>