diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-14 16:21:24 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-14 16:21:24 +0000 |
| commit | 02c465f1ec3a98bba2d9e029ec6887bed6130441 (patch) | |
| tree | f9581fa2a9ef839a2f612210f3a7f7af67aaa5d5 | |
| parent | c4e2b0ab44606ca05ffcd19f7b866c434820defd (diff) | |
| parent | 23b15295b390defeb484b4bd17a8ef15b2219496 (diff) | |
| download | goldfish-aml_tz4_332714010.tar.gz | |
Snap for 11219529 from 23b15295b390defeb484b4bd17a8ef15b2219496 to mainline-tzdata4-releaseaml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_332714010
Change-Id: Ib041162871cd89169f4416f8e968997ee975038a
42 files changed, 1422 insertions, 0 deletions
diff --git a/64bitonly/product/vendor.mk b/64bitonly/product/vendor.mk index edd50199..8aac6847 100644 --- a/64bitonly/product/vendor.mk +++ b/64bitonly/product/vendor.mk @@ -119,6 +119,16 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ DisplayCutoutEmulationEmu01Overlay \ + EmulationPixel7ProOverlay \ + SystemUIEmulationPixel7ProOverlay \ + EmulationPixel7Overlay \ + SystemUIEmulationPixel7Overlay \ + EmulationPixel6ProOverlay \ + SystemUIEmulationPixel6ProOverlay \ + EmulationPixel6Overlay \ + SystemUIEmulationPixel6Overlay \ + EmulationPixel6aOverlay \ + SystemUIEmulationPixel6aOverlay \ EmulationPixel5Overlay \ SystemUIEmulationPixel5Overlay \ EmulationPixel4XLOverlay 4\ diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/Android.mk new file mode 100644 index 00000000..16d68bb5 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/Android.mk @@ -0,0 +1,31 @@ +# +# 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_RRO_THEME := EmulationPixel6 + +LOCAL_PRODUCT_MODULE := true + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := EmulationPixel6Overlay +LOCAL_SDK_VERSION := current + +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +include $(BUILD_RRO_PACKAGE) diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/AndroidManifest.xml b/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/AndroidManifest.xml new file mode 100644 index 00000000..ed01671e --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/AndroidManifest.xml @@ -0,0 +1,24 @@ +<!-- +/** + * Copyright (c) 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. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.internal.emulation.pixel_6" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="android" android:priority="1"/> + <application android:label="Filled" android:hasCode="false"/> +</manifest> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/res/values/config.xml b/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/res/values/config.xml new file mode 100644 index 00000000..1f706e3c --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/res/values/config.xml @@ -0,0 +1,55 @@ +<?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. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Whether the display cutout region of the main built-in display should be forced to + black in software (to avoid aliasing or emulate a cutout that is not physically existent). + --> + <bool name="config_fillMainBuiltInDisplayCutout">true</bool> + + <!-- Display cutout configuration --> + <string translatable="false" name="config_mainBuiltInDisplayCutout"> + M 507,64 + a 33,33 0 1 0 66,0 33,33 0 1 0 -66,0 + Z + @left + </string> + + <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> + M 492,0 + h 118 + v 128 + h -118 + Z + @left + </string> + + <!-- Radius of the software rounded corners. --> + <dimen name="rounded_corner_radius">28px</dimen> + + <!-- Height of the status bar. + Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. + --> + <dimen name="status_bar_height_height_default">74px</dimen> + <dimen name="status_bar_height_portrait">128px</dimen> + <dimen name="status_bar_height_landscape">74px</dimen> + + <!-- Adjustment for software rounded corners since corners aren't perfectly round. --> + <dimen name="rounded_corner_radius_adjustment">5px</dimen> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/res/values/dimens.xml new file mode 100644 index 00000000..8110ae84 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/res/values/dimens.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (c) 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. +*/ +--> +<resources> + <!-- for 20dp of padding at 3.5px/dp at default density --> + <dimen name="rounded_corner_content_padding">50px</dimen> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/Android.mk new file mode 100644 index 00000000..6b56927d --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/Android.mk @@ -0,0 +1,31 @@ +# +# 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_RRO_THEME := SystemUIEmulationPixel6 + +LOCAL_PRODUCT_MODULE := true + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := SystemUIEmulationPixel6Overlay +LOCAL_SDK_VERSION := current + +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +include $(BUILD_RRO_PACKAGE) diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/AndroidManifest.xml b/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/AndroidManifest.xml new file mode 100644 index 00000000..2d72ec75 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/AndroidManifest.xml @@ -0,0 +1,24 @@ +<!-- +/** + * Copyright (c) 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. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.systemui.emulation.pixel_6" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="com.android.systemui" android:priority="1"/> + <application android:label="Filled" android:hasCode="false"/> +</manifest> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/res/values/config.xml b/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/res/values/config.xml new file mode 100644 index 00000000..7c0b71b1 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/res/values/config.xml @@ -0,0 +1,45 @@ +<?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> + <!-- Default rounded corner curve (a Bezier). Must match (the curved path in) rounded.xml. + Note that while rounded.xml includes the entire path (including the horizontal and vertical + corner edges), this pulls out just the curve. + --> + <string name="config_rounded_mask" translatable="false">M 71,0 C 33,0 22,-1 10,10 -1,22 0,33 0,71</string> + + <!-- Configure 13px of extra protection around the front-facing camera --> + <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection"> + M 494,65 + a 46,46 0 1 0 92,0 + a 46,46 0 1 0 -92,0 + Z + </string> + + <!-- Camera 1 is the front camera on barbet --> + <string translatable="false" name="config_protectedCameraId">1</string> + + <!-- Comma-separated list of packages to exclude from camera protection. In our case, + ignore the gaze detection package --> + <string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string> + + <bool name="config_enableDisplayCutoutProtection">true</bool> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/res/values/dimens.xml new file mode 100644 index 00000000..25113744 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/res/values/dimens.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (c) 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. +*/ +--> +<resources> + <!-- Don't need the left side padding due to being inset from the cutout --> + <dimen name="status_bar_padding_start">0dp</dimen> + + <!-- the padding on the top of the statusbar (usually 0) --> + <dimen name="status_bar_padding_top">1px</dimen> + + <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) --> + <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen> + + <!-- Padding for the system icons on the keyguard (when no multi user switch is showing). + The icons always have a 4dp padding in the container so we only need 26 extra px of padding + for the corners --> + <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen> + + <!-- Margin on the right side of the system icon group on Keyguard. --> + <dimen name="system_icons_keyguard_padding_end">4.5dp</dimen> + + <dimen name="keyguard_carrier_text_margin">0px</dimen> + + <dimen name="config_rounded_mask_size">71px</dimen> + <dimen name="config_rounded_mask_size_top">71px</dimen> + <dimen name="config_rounded_mask_size_bottom">70px</dimen> + + <!-- Location on the screen of the center of the physical power button. --> + <dimen name="physical_power_button_center_screen_location_y">650px</dimen> + + <!-- Location on the screen of the center of the physical volume up/down buttons. --> + <dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen> + <dimen name="physical_volume_down_button_center_screen_location_y">1110px</dimen> + + + <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. --> + <dimen name="lock_icon_padding">54px</dimen> + + <!-- Offset should not be more than 1mm --> + <dimen name="udfps_burn_in_offset_y">16px</dimen> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/Android.mk new file mode 100644 index 00000000..b16393d9 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/Android.mk @@ -0,0 +1,31 @@ +# +# 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_RRO_THEME := EmulationPixel6Pro + +LOCAL_PRODUCT_MODULE := true + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := EmulationPixel6ProOverlay +LOCAL_SDK_VERSION := current + +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +include $(BUILD_RRO_PACKAGE) diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/AndroidManifest.xml b/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/AndroidManifest.xml new file mode 100644 index 00000000..559a31f4 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/AndroidManifest.xml @@ -0,0 +1,24 @@ +<!-- +/** + * Copyright (c) 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. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.internal.emulation.pixel_6_pro" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="android" android:priority="1"/> + <application android:label="Filled" android:hasCode="false"/> +</manifest> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/res/values/config.xml b/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/res/values/config.xml new file mode 100644 index 00000000..e72d33cf --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/res/values/config.xml @@ -0,0 +1,50 @@ +<?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. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Whether the display cutout region of the main built-in display should be forced to + black in software (to avoid aliasing or emulate a cutout that is not physically existent). + --> + <bool name="config_fillMainBuiltInDisplayCutout">true</bool> + + <!-- Display cutout configuration --> + <string translatable="false" name="config_mainBuiltInDisplayCutout"> + M 677,72 + a 42,42 0 1 0 84,0 + a 42,42 0 1 0 -84,0 + Z + @left + </string> + + <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> + M 653,0 + h 130 + v 145 + h -130 + Z + @left + </string> + + + <!-- Radius of the software rounded corners. --> + <dimen name="rounded_corner_radius">50px</dimen> + + <!-- Adjustment for software rounded corners since corners aren't perfectly round. --> + <dimen name="rounded_corner_radius_adjustment">5px</dimen> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/res/values/dimens.xml new file mode 100644 index 00000000..7cde2d4a --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/res/values/dimens.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (c) 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. +*/ +--> +<resources> + <!-- for 20dp of padding at 3.5px/dp at default density --> + <dimen name="rounded_corner_content_padding">50px</dimen> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/Android.mk new file mode 100644 index 00000000..f72e2e1c --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/Android.mk @@ -0,0 +1,31 @@ +# +# 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_RRO_THEME := SystemUIEmulationPixel6Pro + +LOCAL_PRODUCT_MODULE := true + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := SystemUIEmulationPixel6ProOverlay +LOCAL_SDK_VERSION := current + +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +include $(BUILD_RRO_PACKAGE) diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/AndroidManifest.xml b/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/AndroidManifest.xml new file mode 100644 index 00000000..4b853fb7 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/AndroidManifest.xml @@ -0,0 +1,24 @@ +<!-- +/** + * Copyright (c) 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. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.systemui.emulation.pixel_6_pro" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="com.android.systemui" android:priority="1"/> + <application android:label="Filled" android:hasCode="false"/> +</manifest> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/res/values/config.xml b/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/res/values/config.xml new file mode 100644 index 00000000..ba1426bb --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/res/values/config.xml @@ -0,0 +1,39 @@ +<?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 --> + <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection"> + M 661,72 + a 57,57 0 1 0 114,0 + a 57,57 0 1 0 -114,0 + Z + </string> + + <!-- Camera 1 is the front camera on barbet --> + <string translatable="false" name="config_protectedCameraId">1</string> + + <!-- Comma-separated list of packages to exclude from camera protection. In our case, + ignore the gaze detection package --> + <string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string> + + <bool name="config_enableDisplayCutoutProtection">true</bool> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/res/values/dimens.xml new file mode 100644 index 00000000..0fb125b1 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/res/values/dimens.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (c) 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. +*/ +--> +<resources> + <!-- the padding on the top of the statusbar (usually 0) --> + <dimen name="status_bar_padding_top">1px</dimen> + + <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) --> + <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen> + + <!-- Padding for the system icons on the keyguard (when no multi user switch is showing). + The icons always have a 4dp padding in the container so we only need 26 extra px of padding + for the corners --> + <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen> + + <!-- Margin on the right side of the system icon group on Keyguard. --> + <dimen name="system_icons_keyguard_padding_end">6.5dp</dimen> + + <!-- A path similar to frameworks/base/core/res/res/values/config.xml + config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a display + cutout. If present as well as config_enableDisplayCutoutProtection is set to true, then + SystemUI will draw this "protection path" instead of the display cutout path that is normally + used for anti-aliasing. + + This path will only be drawn when the front-facing camera turns on, otherwise the main + DisplayCutout path will be rendered + --> + + <!-- Location on the screen of the center of the physical power button. --> + <dimen name="physical_power_button_center_screen_location_y">940px</dimen> + + <!-- Location on the screen of the center of the physical volume up/down buttons. --> + <dimen name="physical_volume_up_button_center_screen_location_y">1320px</dimen> + <dimen name="physical_volume_down_button_center_screen_location_y">1520px</dimen> + + <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. --> + <dimen name="lock_icon_padding">68px</dimen> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/Android.mk new file mode 100644 index 00000000..cc8e8e8e --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/Android.mk @@ -0,0 +1,31 @@ +# +# 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_RRO_THEME := EmulationPixel6a + +LOCAL_PRODUCT_MODULE := true + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := EmulationPixel6aOverlay +LOCAL_SDK_VERSION := current + +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +include $(BUILD_RRO_PACKAGE) diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/AndroidManifest.xml b/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/AndroidManifest.xml new file mode 100644 index 00000000..5b6af794 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/AndroidManifest.xml @@ -0,0 +1,24 @@ +<!-- +/** + * Copyright (c) 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. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.internal.emulation.pixel_6a" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="android" android:priority="1"/> + <application android:label="Filled" android:hasCode="false"/> +</manifest> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/res/values/config.xml b/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/res/values/config.xml new file mode 100644 index 00000000..10291112 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/res/values/config.xml @@ -0,0 +1,42 @@ +<?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. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Whether the display cutout region of the main built-in display should be forced to + black in software (to avoid aliasing or emulate a cutout that is not physically existent). + --> + <bool name="config_fillMainBuiltInDisplayCutout">true</bool> + + <!-- Display cutout configuration --> + <string translatable="false" name="config_mainBuiltInDisplayCutout"> + M 507,66 + a 33,33 0 1 0 66,0 33,33 0 1 0 -66,0 + Z + @left + </string> + + <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> + M 480,0 + h 145 + v 132 + h -145 + Z + @left + </string> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/res/values/dimens.xml new file mode 100644 index 00000000..b9875365 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/res/values/dimens.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (c) 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. +*/ +--> +<resources> + <!-- Radius of the software rounded corners. --> + <dimen name="rounded_corner_radius">47px</dimen> + <dimen name="rounded_corner_radius_top">47px</dimen> + <dimen name="rounded_corner_radius_bottom">48px</dimen> + + <!-- for 20dp of padding at 3.5px/dp at default density --> + <dimen name="rounded_corner_content_padding">47px</dimen> + + <!-- Height of the status bar. + Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. + --> + <dimen name="status_bar_height_default">28dp</dimen> + <dimen name="status_bar_height_portrait">132px</dimen> + <dimen name="status_bar_height_landscape">28dp</dimen> + + <!-- Adjustment for software rounded corners since corners aren't perfectly round. --> + <dimen name="rounded_corner_radius_adjustment">5px</dimen> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/Android.mk new file mode 100644 index 00000000..42778eae --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/Android.mk @@ -0,0 +1,31 @@ +# +# 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_RRO_THEME := SystemUIEmulationPixel6a + +LOCAL_PRODUCT_MODULE := true + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := SystemUIEmulationPixel6aOverlay +LOCAL_SDK_VERSION := current + +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +include $(BUILD_RRO_PACKAGE) diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/AndroidManifest.xml b/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/AndroidManifest.xml new file mode 100644 index 00000000..328f2420 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/AndroidManifest.xml @@ -0,0 +1,24 @@ +<!-- +/** + * Copyright (c) 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. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.systemui.emulation.pixel_6a" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="com.android.systemui" android:priority="1"/> + <application android:label="Filled" android:hasCode="false"/> +</manifest> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/res/values/config.xml b/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/res/values/config.xml new file mode 100644 index 00000000..9b82fd4a --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/res/values/config.xml @@ -0,0 +1,45 @@ +<?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> + <!-- Default rounded corner curve (a Bezier). Must match (the curved path in) rounded.xml. + Note that while rounded.xml includes the entire path (including the horizontal and vertical + corner edges), this pulls out just the curve. + --> + <string name="config_rounded_mask" translatable="false">M 71,0 C 33,0 22,-1 10,10 -1,22 0,33 0,71</string> + + <!-- Configure 13px of extra protection around the front-facing camera --> + <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection"> + M 494,66 + a 46,46 0 1 0 92,0 + a 46,46 0 1 0 -92,0 + Z + </string> + + <!-- Camera 1 is the front camera on barbet --> + <string translatable="false" name="config_protectedCameraId">1</string> + + <!-- Comma-separated list of packages to exclude from camera protection. In our case, + ignore the gaze detection package --> + <string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string> + + <bool name="config_enableDisplayCutoutProtection">true</bool> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/res/values/dimens.xml new file mode 100644 index 00000000..5609bfc7 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/res/values/dimens.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (c) 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. +*/ +--> +<resources> + <!-- Don't need the left side padding due to being inset from the cutout --> + <dimen name="status_bar_padding_start">0dp</dimen> + + <!-- the padding on the top of the statusbar (usually 0) --> + <dimen name="status_bar_padding_top">1px</dimen> + + <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) --> + <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen> + + <!-- Padding for the system icons on the keyguard (when no multi user switch is showing). + The icons always have a 4dp padding in the container so we only need 56 extra px of padding + for the corners --> + <dimen name="system_icons_super_container_avatarless_margin_end">11px</dimen> + + <!-- Multi user switch has some intrinsic padding to it --> + <dimen name="multi_user_switch_keyguard_margin">6dp</dimen> + + <dimen name="keyguard_carrier_text_margin">0px</dimen> + + <dimen name="config_rounded_mask_size">47px</dimen> + <dimen name="config_rounded_mask_size_top">47px</dimen> + <dimen name="config_rounded_mask_size_bottom">46px</dimen> + + <!-- Location on the screen of the center of the physical power button. --> + <dimen name="physical_power_button_center_screen_location_y">650px</dimen> + + <!-- Location on the screen of the center of the physical volume up/down buttons. --> + <dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen> + <dimen name="physical_volume_down_button_center_screen_location_y">1110px</dimen> + + <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. --> + <dimen name="lock_icon_padding">56px</dimen> + + <!-- Offset should not be more than 1mm --> + <dimen name="udfps_burn_in_offset_y">16px</dimen> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/Android.mk new file mode 100644 index 00000000..d7a30133 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/Android.mk @@ -0,0 +1,31 @@ +# +# 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_RRO_THEME := EmulationPixel7 + +LOCAL_PRODUCT_MODULE := true + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := EmulationPixel7Overlay +LOCAL_SDK_VERSION := current + +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +include $(BUILD_RRO_PACKAGE) diff --git a/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/AndroidManifest.xml b/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/AndroidManifest.xml new file mode 100644 index 00000000..e44adf0e --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/AndroidManifest.xml @@ -0,0 +1,24 @@ +<!-- +/** + * Copyright (c) 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. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.internal.emulation.pixel_7" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="android" android:priority="1"/> + <application android:label="Filled" android:hasCode="false"/> +</manifest> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/res/values/config.xml b/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/res/values/config.xml new file mode 100644 index 00000000..604b6350 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/res/values/config.xml @@ -0,0 +1,42 @@ +<?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. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Whether the display cutout region of the main built-in display should be forced to + black in software (to avoid aliasing or emulate a cutout that is not physically existent). + --> + <bool name="config_fillMainBuiltInDisplayCutout">true</bool> + + <!-- Display cutout configuration --> + <string translatable="false" name="config_mainBuiltInDisplayCutout"> + M 506,68 + a 34,34 0 1 0 68,0 34,34 0 1 0 -68,0 + Z + @left + </string> + + <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> + M 480,0 + h 145 + v 136 + h -145 + Z + @left + </string> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/res/values/dimens.xml new file mode 100644 index 00000000..f038cd01 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7/AndroidOverlay/res/values/dimens.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (c) 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. +*/ +--> +<resources> + <!-- Radius of the software rounded corners. --> + <dimen name="rounded_corner_radius">47px</dimen> + <dimen name="rounded_corner_radius_top">47px</dimen> + <dimen name="rounded_corner_radius_bottom">48px</dimen> + + <!-- for 20dp of padding at 3.5px/dp at default density --> + <dimen name="rounded_corner_content_padding">47px</dimen> + + <!-- Height of the status bar. + Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. + --> + <dimen name="status_bar_height_default">28dp</dimen> + <dimen name="status_bar_height_portrait">136px</dimen> + <dimen name="status_bar_height_landscape">28dp</dimen> + + <!-- Adjustment for software rounded corners since corners aren't perfectly round. --> + <dimen name="rounded_corner_radius_adjustment">5px</dimen> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/Android.mk new file mode 100644 index 00000000..3c0c1b8d --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/Android.mk @@ -0,0 +1,31 @@ +# +# 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_RRO_THEME := SystemUIEmulationPixel7 + +LOCAL_PRODUCT_MODULE := true + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := SystemUIEmulationPixel7Overlay +LOCAL_SDK_VERSION := current + +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +include $(BUILD_RRO_PACKAGE) diff --git a/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/AndroidManifest.xml b/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/AndroidManifest.xml new file mode 100644 index 00000000..9ea7d413 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/AndroidManifest.xml @@ -0,0 +1,24 @@ +<!-- +/** + * Copyright (c) 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. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.systemui.emulation.pixel_7" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="com.android.systemui" android:priority="1"/> + <application android:label="Filled" android:hasCode="false"/> +</manifest> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/res/values/config.xml b/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/res/values/config.xml new file mode 100644 index 00000000..0dbd2bb3 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/res/values/config.xml @@ -0,0 +1,45 @@ +<?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> + <!-- Default rounded corner curve (a Bezier). Must match (the curved path in) rounded.xml. + Note that while rounded.xml includes the entire path (including the horizontal and vertical + corner edges), this pulls out just the curve. + --> + <string name="config_rounded_mask" translatable="false">M 71,0 C 33,0 22,-1 10,10 -1,22 0,33 0,71</string> + + <!-- Configure 13px of extra protection around the front-facing camera --> + <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection"> + M 494,67 + a 46,46 0 1 0 92,0 + a 46,46 0 1 0 -92,0 + Z + </string> + + <!-- Camera 1 is the front camera on P10 --> + <string translatable="false" name="config_protectedCameraId">1</string> + + <!-- Comma-separated list of packages to exclude from camera protection. In our case, + ignore the gaze detection package --> + <string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string> + + <bool name="config_enableDisplayCutoutProtection">true</bool> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/res/values/dimens.xml new file mode 100644 index 00000000..3fb523d1 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7/SystemUIOverlay/res/values/dimens.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (c) 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. +*/ +--> +<resources> + <!-- Don't need the left side padding due to being inset from the cutout --> + <dimen name="status_bar_padding_start">0dp</dimen> + + <!-- the padding on the top of the statusbar (usually 0) --> + <dimen name="status_bar_padding_top">1px</dimen> + + <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) --> + <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen> + + <!-- Padding for the system icons on the keyguard (when no multi user switch is showing). + The icons always have a 4dp padding in the container so we only need 56 extra px of padding + for the corners --> + <dimen name="system_icons_super_container_avatarless_margin_end">11px</dimen> + + <!-- Multi user switch has some intrinsic padding to it --> + <dimen name="multi_user_switch_keyguard_margin">6dp</dimen> + + <dimen name="keyguard_carrier_text_margin">0px</dimen> + + <dimen name="config_rounded_mask_size">47px</dimen> + <dimen name="config_rounded_mask_size_top">47px</dimen> + <dimen name="config_rounded_mask_size_bottom">46px</dimen> + + <!-- Location on the screen of the center of the physical power button. --> + <dimen name="physical_power_button_center_screen_location_y">650px</dimen> + + <!-- Location on the screen of the center of the physical volume up/down buttons. --> + <dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen> + <dimen name="physical_volume_down_button_center_screen_location_y">1110px</dimen> + + <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. --> + <dimen name="lock_icon_padding">48px</dimen> + + <!-- Movement should not be more than 1mm --> + <dimen name="udfps_burn_in_offset_y">16px</dimen> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/Android.mk new file mode 100644 index 00000000..40f71615 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/Android.mk @@ -0,0 +1,31 @@ +# +# 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_RRO_THEME := EmulationPixel7Pro + +LOCAL_PRODUCT_MODULE := true + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := EmulationPixel7ProOverlay +LOCAL_SDK_VERSION := current + +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +include $(BUILD_RRO_PACKAGE) diff --git a/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/AndroidManifest.xml b/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/AndroidManifest.xml new file mode 100644 index 00000000..a2c6a25b --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/AndroidManifest.xml @@ -0,0 +1,24 @@ +<!-- +/** + * Copyright (c) 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. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.internal.emulation.pixel_7_pro" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="android" android:priority="1"/> + <application android:label="Filled" android:hasCode="false"/> +</manifest> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/res/values/config.xml b/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/res/values/config.xml new file mode 100644 index 00000000..a83c6772 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/res/values/config.xml @@ -0,0 +1,43 @@ +<?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. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Whether the display cutout region of the main built-in display should be forced to + black in software (to avoid aliasing or emulate a cutout that is not physically existent). + --> + <bool name="config_fillMainBuiltInDisplayCutout">true</bool> + + <!-- Display cutout configuration --> + <string translatable="false" name="config_mainBuiltInDisplayCutout"> + M 677,72 + a 43,43 0 1 0 86,0 + a 43,43 0 1 0 -86,0 + Z + @left + </string> + + <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> + M 653,0 + h 145 + v 144 + h -145 + Z + @left + </string> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/res/values/dimens.xml new file mode 100644 index 00000000..000ef9ae --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7_pro/AndroidOverlay/res/values/dimens.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (c) 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. +*/ +--> +<resources> + <!-- Radius of the software rounded corners. --> + <dimen name="rounded_corner_radius">50px</dimen> + <dimen name="rounded_corner_radius_top">50px</dimen> + <dimen name="rounded_corner_radius_bottom">49px</dimen> + + <!-- for 20dp of padding at 3.5px/dp at default density --> + <dimen name="rounded_corner_content_padding">50px</dimen> + + <!-- Height of the status bar. + Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. + --> + <dimen name="status_bar_height_default">28dp</dimen> + <dimen name="status_bar_height_portrait">144px</dimen> + <dimen name="status_bar_height_landscape">28dp</dimen> + + <!-- Adjustment for software rounded corners since corners aren't perfectly round. --> + <dimen name="rounded_corner_radius_adjustment">5px</dimen> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/Android.mk new file mode 100644 index 00000000..62734880 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/Android.mk @@ -0,0 +1,31 @@ +# +# 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_RRO_THEME := SystemUIEmulationPixel7Pro + +LOCAL_PRODUCT_MODULE := true + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := SystemUIEmulationPixel7ProOverlay +LOCAL_SDK_VERSION := current + +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +include $(BUILD_RRO_PACKAGE) diff --git a/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/AndroidManifest.xml b/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/AndroidManifest.xml new file mode 100644 index 00000000..01eb86f3 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/AndroidManifest.xml @@ -0,0 +1,24 @@ +<!-- +/** + * Copyright (c) 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. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.systemui.emulation.pixel_7_pro" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="com.android.systemui" android:priority="1"/> + <application android:label="Filled" android:hasCode="false"/> +</manifest> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/res/values/config.xml b/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/res/values/config.xml new file mode 100644 index 00000000..1740a3bb --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/res/values/config.xml @@ -0,0 +1,36 @@ +<?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 --> + <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection"> + M 662,72 + a 57,57 0 1 0 114,0 + a 57,57 0 1 0 -114,0 + Z + </string> + + <!-- Comma-separated list of packages to exclude from camera protection. In our case, + ignore the gaze detection package --> + <string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string> + + <bool name="config_enableDisplayCutoutProtection">true</bool> +</resources> diff --git a/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/res/values/dimens.xml b/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/res/values/dimens.xml new file mode 100644 index 00000000..bef4e8d3 --- /dev/null +++ b/overlay/frameworks/base/packages/overlays/pixel_7_pro/SystemUIOverlay/res/values/dimens.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (c) 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. +*/ +--> +<resources> + <!-- the padding on the top of the statusbar (usually 0) --> + <dimen name="status_bar_padding_top">1px</dimen> + + <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) --> + <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen> + + <!-- Padding for the system icons on the keyguard (when no multi user switch is showing). + The icons always have a 4dp padding in the container so we only need 26 extra px of padding + for the corners --> + <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen> + + <!-- Margin on the right side of the system icon group on Keyguard. --> + <dimen name="system_icons_keyguard_padding_end">6.5dp</dimen> + + <!-- Camera 1 is the front camera --> + <string translatable="false" name="config_protectedCameraId">1</string> + + <!-- Location on the screen of the center of the physical power button. --> + <dimen name="physical_power_button_center_screen_location_y">940px</dimen> + + <!-- Location on the screen of the center of the physical volume up/down buttons. --> + <dimen name="physical_volume_up_button_center_screen_location_y">1320px</dimen> + <dimen name="physical_volume_down_button_center_screen_location_y">1520px</dimen> + + <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. --> + <dimen name="lock_icon_padding">60px</dimen> +</resources> @@ -115,6 +115,16 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ DisplayCutoutEmulationEmu01Overlay \ + EmulationPixel7ProOverlay \ + SystemUIEmulationPixel7ProOverlay \ + EmulationPixel7Overlay \ + SystemUIEmulationPixel7Overlay \ + EmulationPixel6ProOverlay \ + SystemUIEmulationPixel6ProOverlay \ + EmulationPixel6Overlay \ + SystemUIEmulationPixel6Overlay \ + EmulationPixel6aOverlay \ + SystemUIEmulationPixel6aOverlay \ EmulationPixel5Overlay \ SystemUIEmulationPixel5Overlay \ EmulationPixel4XLOverlay \ |