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

Commit cca19d0c authored by Beverly's avatar Beverly Committed by android-build-merger
Browse files

Merge "Adjust window rounded corners" into qt-r1-dev am: dcba632b 

am: 189c662b

Change-Id: Ic7e5ad474fcecb99c8b48c499e349bff3cd79c2d
parents fb64399e 189c662b

core/java/com/android/internal/policy/ScreenDecorationsUtils.java

+6 −3
Original line number Diff line number Diff line
@@ -36,13 +36,16 @@ public class ScreenDecorationsUtils { 
        }



        // Radius that should be used in case top or bottom aren't defined.

        float defaultRadius = resources.getDimension(R.dimen.rounded_corner_radius);

        float defaultRadius = resources.getDimension(R.dimen.rounded_corner_radius)

                - resources.getDimension(R.dimen.rounded_corner_radius_adjustment);



        float topRadius = resources.getDimension(R.dimen.rounded_corner_radius_top);

        float topRadius = resources.getDimension(R.dimen.rounded_corner_radius_top)

                - resources.getDimension(R.dimen.rounded_corner_radius_top_adjustment);

        if (topRadius == 0f) {

            topRadius = defaultRadius;

        }

        float bottomRadius = resources.getDimension(R.dimen.rounded_corner_radius_bottom);

        float bottomRadius = resources.getDimension(R.dimen.rounded_corner_radius_bottom)

                - resources.getDimension(R.dimen.rounded_corner_radius_bottom_adjustment);

        if (bottomRadius == 0f) {

            bottomRadius = defaultRadius;

        }

core/res/res/values/dimens.xml

+18 −0
Original line number Diff line number Diff line
@@ -90,6 +90,24 @@ 
        orientation. If zero, the value of rounded_corner_radius is used. -->

    <dimen name="rounded_corner_radius_bottom">0dp</dimen>



    <!-- Default adjustment for the software rounded corners since corners are not perfectly

        round. This value is used when retrieving the "radius" of the rounded corner in cases

        where the exact bezier curve cannot be retrieved.  This value will be subtracted from

        rounded_corner_radius to more accurately provide a "radius" for the rounded corner. -->

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

    <!-- Top adjustment for the software rounded corners since corners are not perfectly

        round.  This value is used when retrieving the "radius" of the top rounded corner in cases

        where the exact bezier curve cannot be retrieved.  This value will be subtracted from

        rounded_corner_radius_top to more accurately provide a "radius" for the top rounded corners.

         -->

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

    <!-- Bottom adjustment for the software rounded corners since corners are not perfectly

        round.  This value is used when retrieving the "radius" of the bottom rounded corner in

        cases where the exact bezier curve cannot be retrieved.  This value will be subtracted from

        rounded_corner_radius_bottom to more accurately provide a "radius" for the bottom rounded

        corners. -->

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



    <!-- Width of the window of the divider bar used to resize docked stacks. -->

    <dimen name="docked_stack_divider_thickness">48dp</dimen>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -3708,6 +3708,9 @@ 
  <java-symbol type="dimen" name="rounded_corner_radius" />

  <java-symbol type="dimen" name="rounded_corner_radius_top" />

  <java-symbol type="dimen" name="rounded_corner_radius_bottom" />

  <java-symbol type="dimen" name="rounded_corner_radius_adjustment" />

  <java-symbol type="dimen" name="rounded_corner_radius_top_adjustment" />

  <java-symbol type="dimen" name="rounded_corner_radius_bottom_adjustment" />

  <java-symbol type="bool" name="config_supportsRoundedCornersOnWindows" />



  <java-symbol type="string" name="config_defaultModuleMetadataProvider" />