From bfe8cef4498ce8ddb879746004a240779b946b24 Mon Sep 17 00:00:00 2001 From: Immanuel Raj Date: Sun, 25 Dec 2022 15:41:11 +0100 Subject: [PATCH] clover: overlay: Switch to RRO from Overlays Co-authored-by: pix106 Signed-off-by: pix106 --- device.mk | 4 ++++ .../CloverFrameworksOverlay/Android.bp | 22 +++++++++++++++++++ .../AndroidManifest.xml | 21 ++++++++++++++++++ .../res/values/config.xml | 0 .../res/values/dimens.xml | 0 .../res/xml/power_profile.xml | 0 rro_overlays/CloverSystemUIOverlay/Android.bp | 22 +++++++++++++++++++ .../CloverSystemUIOverlay/AndroidManifest.xml | 21 ++++++++++++++++++ .../res/drawable/rounded.xml | 0 .../res/drawable/rounded_corner_bottom.xml | 0 .../res/drawable/rounded_corner_top.xml | 0 11 files changed, 90 insertions(+) create mode 100644 rro_overlays/CloverFrameworksOverlay/Android.bp create mode 100644 rro_overlays/CloverFrameworksOverlay/AndroidManifest.xml rename {overlay/frameworks/base/core/res => rro_overlays/CloverFrameworksOverlay}/res/values/config.xml (100%) rename {overlay/frameworks/base/core/res => rro_overlays/CloverFrameworksOverlay}/res/values/dimens.xml (100%) rename {overlay/frameworks/base/core/res => rro_overlays/CloverFrameworksOverlay}/res/xml/power_profile.xml (100%) create mode 100644 rro_overlays/CloverSystemUIOverlay/Android.bp create mode 100644 rro_overlays/CloverSystemUIOverlay/AndroidManifest.xml rename {overlay/frameworks/base/packages/SystemUI => rro_overlays/CloverSystemUIOverlay}/res/drawable/rounded.xml (100%) rename {overlay/frameworks/base/packages/SystemUI => rro_overlays/CloverSystemUIOverlay}/res/drawable/rounded_corner_bottom.xml (100%) rename {overlay/frameworks/base/packages/SystemUI => rro_overlays/CloverSystemUIOverlay}/res/drawable/rounded_corner_top.xml (100%) diff --git a/device.mk b/device.mk index 037eb88..055a799 100644 --- a/device.mk +++ b/device.mk @@ -41,6 +41,10 @@ PRODUCT_COPY_FILES += \ DEVICE_PACKAGE_OVERLAYS += \ $(DEVICE_PATH)/overlay +PRODUCT_PACKAGES += \ + CloverFrameworksOverlay \ + CloverSystemUIOverlay + # Permissions PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml diff --git a/rro_overlays/CloverFrameworksOverlay/Android.bp b/rro_overlays/CloverFrameworksOverlay/Android.bp new file mode 100644 index 0000000..4c9b8f5 --- /dev/null +++ b/rro_overlays/CloverFrameworksOverlay/Android.bp @@ -0,0 +1,22 @@ +// +// Copyright (C) 2022 PixelExperience +// +// 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. +// + +runtime_resource_overlay { + name: "CloverFrameworksOverlay", + sdk_version: "current", + resource_dirs: ["res"], + vendor: true, +} diff --git a/rro_overlays/CloverFrameworksOverlay/AndroidManifest.xml b/rro_overlays/CloverFrameworksOverlay/AndroidManifest.xml new file mode 100644 index 0000000..f6f40be --- /dev/null +++ b/rro_overlays/CloverFrameworksOverlay/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/rro_overlays/CloverFrameworksOverlay/res/values/config.xml similarity index 100% rename from overlay/frameworks/base/core/res/res/values/config.xml rename to rro_overlays/CloverFrameworksOverlay/res/values/config.xml diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/rro_overlays/CloverFrameworksOverlay/res/values/dimens.xml similarity index 100% rename from overlay/frameworks/base/core/res/res/values/dimens.xml rename to rro_overlays/CloverFrameworksOverlay/res/values/dimens.xml diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/rro_overlays/CloverFrameworksOverlay/res/xml/power_profile.xml similarity index 100% rename from overlay/frameworks/base/core/res/res/xml/power_profile.xml rename to rro_overlays/CloverFrameworksOverlay/res/xml/power_profile.xml diff --git a/rro_overlays/CloverSystemUIOverlay/Android.bp b/rro_overlays/CloverSystemUIOverlay/Android.bp new file mode 100644 index 0000000..dafd2c4 --- /dev/null +++ b/rro_overlays/CloverSystemUIOverlay/Android.bp @@ -0,0 +1,22 @@ +// +// Copyright (C) 2022 PixelExperience +// +// 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. +// + +runtime_resource_overlay { + name: "CloverSystemUIOverlay", + sdk_version: "current", + resource_dirs: ["res"], + vendor: true, +} diff --git a/rro_overlays/CloverSystemUIOverlay/AndroidManifest.xml b/rro_overlays/CloverSystemUIOverlay/AndroidManifest.xml new file mode 100644 index 0000000..12e852c --- /dev/null +++ b/rro_overlays/CloverSystemUIOverlay/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml b/rro_overlays/CloverSystemUIOverlay/res/drawable/rounded.xml similarity index 100% rename from overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml rename to rro_overlays/CloverSystemUIOverlay/res/drawable/rounded.xml diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/rro_overlays/CloverSystemUIOverlay/res/drawable/rounded_corner_bottom.xml similarity index 100% rename from overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml rename to rro_overlays/CloverSystemUIOverlay/res/drawable/rounded_corner_bottom.xml diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml b/rro_overlays/CloverSystemUIOverlay/res/drawable/rounded_corner_top.xml similarity index 100% rename from overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml rename to rro_overlays/CloverSystemUIOverlay/res/drawable/rounded_corner_top.xml