Refine config for punch hole and round corner to anti-alias Jagged edges in the round corner The punch hole looks not balance Test: manual build and review the visual on the screen Bug: 145707162 Change-Id: I9e4733907ad875c370a70ae6839b7f1ea19a15c2
diff --git a/sunfish/overlay/frameworks/base/core/res/res/values/config.xml b/sunfish/overlay/frameworks/base/core/res/res/values/config.xml index 714e8bd..8de1fd7 100755 --- a/sunfish/overlay/frameworks/base/core/res/res/values/config.xml +++ b/sunfish/overlay/frameworks/base/core/res/res/values/config.xml
@@ -174,25 +174,27 @@ M 41,83 a 42,42 0 1,0 84,0 a 42,42 0 1,0 -84,0 but using a radius 43 circle for now to see the antialiasing. --> - M40,83a43,43 0 1,0 86,0a43,43 0 1,0 -86,0 + M 128,83 A 44,44 0 0 1 84,127 44,44 0 0 1 40,83 44,44 0 0 1 84,39 44,44 0 0 1 128,83 Z @left </string> <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> M 0.0,0.0 - h 129 - v 129 - h -129 + h 136 + v 136 + h -136 Z @left </string> <!-- Radius of the software rounded corners. --> - <dimen name="rounded_corner_radius">135px</dimen> + <dimen name="rounded_corner_radius">136px</dimen> <!-- Height of the status bar --> <dimen name="status_bar_height_portrait">136px</dimen> <!-- Height of area above QQS where battery/time go (equal to status bar) --> <dimen name="quick_qs_offset_height">136px</dimen> + <!-- Total height of QQS (quick_qs_offset_height + 128) --> + <dimen name="quick_qs_total_height">488px</dimen> </resources>
diff --git a/sunfish/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml b/sunfish/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml index bc5bba7..fdd81cb 100644 --- a/sunfish/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml +++ b/sunfish/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
@@ -1,9 +1,23 @@ +<!-- + Copyright (C) 2020 The Android Open Source Project + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="135dp" - android:height="135dp" - android:viewportWidth="135.0" - android:viewportHeight="135.0"> + android:width="136dp" + android:height="136dp" + android:viewportWidth="136.0" + android:viewportHeight="136.0"> + <path - android:pathData="M0,0L0,135.06C0.71,108.86 2.21,90.69 4.5,80.55C6.89,69.93 9.68,60.75 13.5,53.01C18.76,42.35 25.45,34.43 30.87,29.25C36.23,24.14 43.12,18.31 53.5,13.27C61.14,9.56 71.1,6.27 81.46,4C91.46,1.81 109.3,0.5 135,0.06L0,0Z" + android:pathData="M 0,0 V 136 C 0.71,108.86 2.21,90.69 4.5,80.55 6.89,69.93 9.68,60.75 13.5,53.01 18.76,42.35 25.45,34.43 30.87,29.25 36.23,24.14 43.12,18.31 53.5,13.27 61.14,9.56 71.1,6.27 81.46,4 91.46,1.81 109.3,0.5 136,0 Z" android:fillColor="#000000" /> </vector>