Evolution-X-Tensor/device_google_comet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Update camera cutout and rounded rect" into main

Browse source
This commit is contained in:
Kimi Hsu 2023-10-26 01:53:21 +00:00 • committed by Android (Google) Code Review
commit 5636fedb09
6 changed files with 55 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
comet/overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -263,8 +263,8 @@
<bool name="config_fillSecondaryBuiltInDisplayCutout">true</bool>
<!-- Display cutout configuration -->
<string translatable="false" name="config_mainBuiltInDisplayCutout">
m 2025.1112,78.5 a 36.4343,36.431883 0 0 0 -72.8686,0 36.4343,36.431883 0 0 0 72.8686,0 z
@right
m 2027,80 a 39.5,39.5 0 0 0 -79,0 39.5,39.5 0 0 0 79,0 z
@left
</string>
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
@ -272,12 +272,12 @@
@right
</string>
<string translatable="false" name="config_secondaryBuiltInDisplayCutout">
m 660.77971,189.33189 a 39.744605,39.965524 0 0 0 -79.48921,0 39.744605,39.965524 0 0 0 79.48921,0 z
m 581.5,86 a 41.5,41.5 0 0 0 -83,0 41.5,41.5 0 0 0 83,0 z
@left
</string>
<string translatable="false" name="config_secondaryBuiltInDisplayCutoutRectApproximation">
m 579.5351,147.83189 h 83 v 83 h -83 z
m 484,20 h 112 v 132 h -112 z
@left
</string>

10
comet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
View file

@ -12,11 +12,11 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="142px"
android:height="142px"
android:viewportWidth="142"
android:viewportHeight="142">
android:width="142.4px"
android:height="142.4px"
android:viewportWidth="142.4"
android:viewportHeight="142.4">
<path
android:fillColor="#000000"
android:pathData="M 0.36718215,141.72593 0.5722516,120.21728 2.9710973,95.954655 10.667571,69.95761 25.402706,44.930369 46.615548,24.115468 71.355396,10.082677 96.864172,2.810842 120.62678,0.55883527 141.72762,0.36697958 H 0.37 V 141.72 z"/>
android:pathData="m 0.2,141.38 c 0,0 -0.18,-14.35 0.21,-21.51 C 1.19,111.76 1.59,103.59 3.15,95.62 4.88,86.75 7.24,77.91 10.84,69.62 14.7,60.75 19.61,52.22 25.58,44.6 31.68,36.8 38.88,29.75 46.79,23.79 54.36,18.08 62.78,13.42 71.52,9.76 79.68,6.34 88.34,4.12 97.03,2.48 104.85,1.01 112.84,0.64 120.79,0.23 127.81,-0.13 141.89,0.04 141.89,0.04 H 0 V 141.38 Z"/>
</vector>

10
comet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom_secondary.xml
View file

@ -12,12 +12,12 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="196px"
android:height="196px"
android:viewportWidth="196"
android:viewportHeight="196">
android:width="196.2px"
android:height="196.2px"
android:viewportWidth="196.2"
android:viewportHeight="196.2">
<path
android:fillColor="#000000"
android:pathData="M 0.41700514,195.64292 0.54157654,163.21407 2.0678255,133.65079 7.2939781,104.71395 18.112341,76.603825 35.203139,50.936003 57.878707,29.706783 82.852085,15.092599 109.60055,6.040851 136.92456,1.7486483 164.88562,0.51443083 195.56143,0.41555729 H 0.417 V 195.64 Z" />
android:pathData="m 0.05,195.2 c 0,0 -0.17,-21.62 0.12,-32.43 0.27,-9.86 0.39,-19.76 1.53,-29.56 1.13,-9.74 2.58,-19.5 5.23,-28.93 C 10.18,94.67 13.68,85.14 18.29,76.23 23.02,67.1 28.74,58.4 35.38,50.56 42.07,42.66 49.76,35.52 58.05,29.33 65.78,23.56 74.25,18.72 83.02,14.72 c 8.56,-3.91 17.6,-6.8 26.74,-9.05 8.95,-2.2 18.15,-3.37 27.32,-4.29 9.28,-0.93 18.63,-1.01 27.96,-1.23 10.22,-0.24 30.67,-0.1 30.67,-0.1 H 0.05 V 195.7 Z" />
</vector>

10
comet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
View file

@ -12,11 +12,11 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="142px"
android:height="142px"
android:viewportWidth="142"
android:viewportHeight="142">
android:width="142.4px"
android:height="142.4px"
android:viewportWidth="142.4"
android:viewportHeight="142.4">
<path
android:fillColor="#000000"
android:pathData="M 0.36718215,141.72593 0.5722516,120.21728 2.9710973,95.954655 10.667571,69.95761 25.402706,44.930369 46.615548,24.115468 71.355396,10.082677 96.864172,2.810842 120.62678,0.55883527 141.72762,0.36697958 H 0.37 V 141.72 z"/>
android:pathData="m 0.2,141.38 c 0,0 -0.18,-14.35 0.21,-21.51 C 1.19,111.76 1.59,103.59 3.15,95.62 4.88,86.75 7.24,77.91 10.84,69.62 14.7,60.75 19.61,52.22 25.58,44.6 31.68,36.8 38.88,29.75 46.79,23.79 54.36,18.08 62.78,13.42 71.52,9.76 79.68,6.34 88.34,4.12 97.03,2.48 104.85,1.01 112.84,0.64 120.79,0.23 127.81,-0.13 141.89,0.04 141.89,0.04 H 0 V 141.38 Z"/>
</vector>

10
comet/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top_secondary.xml
View file

@ -12,12 +12,12 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="196px"
android:height="196px"
android:viewportWidth="196"
android:viewportHeight="196">
android:width="196.2px"
android:height="196.2px"
android:viewportWidth="196.2"
android:viewportHeight="196.2">
<path
android:fillColor="#000000"
android:pathData="M 0.41700514,195.64292 0.54157654,163.21407 2.0678255,133.65079 7.2939781,104.71395 18.112341,76.603825 35.203139,50.936003 57.878707,29.706783 82.852085,15.092599 109.60055,6.040851 136.92456,1.7486483 164.88562,0.51443083 195.56143,0.41555729 H 0.417 V 195.64 Z" />
android:pathData="m 0.05,195.2 c 0,0 -0.17,-21.62 0.12,-32.43 0.27,-9.86 0.39,-19.76 1.53,-29.56 1.13,-9.74 2.58,-19.5 5.23,-28.93 C 10.18,94.67 13.68,85.14 18.29,76.23 23.02,67.1 28.74,58.4 35.38,50.56 42.07,42.66 49.76,35.52 58.05,29.33 65.78,23.56 74.25,18.72 83.02,14.72 c 8.56,-3.91 17.6,-6.8 26.74,-9.05 8.95,-2.2 18.15,-3.37 27.32,-4.29 9.28,-0.93 18.63,-1.01 27.96,-1.23 10.22,-0.24 30.67,-0.1 30.67,-0.1 H 0.05 V 195.7 Z" />
</vector>

31
comet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml Normal file
View file

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2023, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** 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.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<!-- Configure 13px of extra protection around the front-facing camera for outer display -->
<string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
m 594.5,86 a 54.5,54.5 0 0 0 -109,0 54.5,54.5 0 0 0 109,0 z
</string>
<!-- Configure 13px of extra protection around the front-facing camera for inner display-->
<string translatable="false" name="config_innerBuiltInDisplayCutoutProtection">
m 2040,80 a 52.5,52.5 0 0 0 -105,0 52.5,52.5 0 0 0 105,0 z
</string>
</resources>