Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adjust window rounded corners" into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-11 20:01:41 +00:00
committed by Android (Google) Code Review
parent edee6e6c2a 72dbd11ccd
commit dcba632b41
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/policy/ScreenDecorationsUtils.java
View File

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

18
core/res/res/values/dimens.xml
View File

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

3
core/res/res/values/symbols.xml
View File

@@ -3703,6 +3703,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" />