From fa2898b39eeacf9686a669a6a4872a3888bbb7a9 Mon Sep 17 00:00:00 2001 From: Alexander Koskovich Date: Wed, 13 Apr 2022 22:09:41 -0700 Subject: [PATCH] kebab: overlay: Convert to RRO packages Change-Id: Iae6ef9fa9743bd2447991ad11d38fa184b12981d --- Android.bp | 2 + device.mk | 10 +++- overlay/OPlusFrameworksResTarget/Android.bp | 10 ++++ .../AndroidManifest.xml | 13 +++++ .../res/values/config.xml | 54 +++++++++---------- .../res/values/dimens.xml | 18 +++++++ .../res/xml/power_profile.xml | 0 .../OPlusSettingsProviderResTarget/Android.bp | 10 ++++ .../AndroidManifest.xml | 13 +++++ .../res/values/defaults.xml | 11 ++++ overlay/OPlusSystemUIResTarget/Android.bp | 10 ++++ .../AndroidManifest.xml | 13 +++++ .../res/drawable/rounded_corner_bottom.xml | 0 .../res/drawable/rounded_corner_top.xml | 0 .../res/values-land/dimens.xml | 17 ++++++ .../res/values/config.xml | 14 +++++ .../res/values/dimens.xml | 18 ++----- .../base/core/res/res/values/dimens.xml | 30 ----------- .../SettingsProvider/res/values/defaults.xml | 22 -------- .../SystemUI/res/values-land/dimens.xml | 27 ---------- .../packages/SystemUI/res/values/config.xml | 28 ---------- 21 files changed, 171 insertions(+), 149 deletions(-) create mode 100644 Android.bp create mode 100644 overlay/OPlusFrameworksResTarget/Android.bp create mode 100644 overlay/OPlusFrameworksResTarget/AndroidManifest.xml rename overlay/{frameworks/base/core/res => OPlusFrameworksResTarget}/res/values/config.xml (94%) create mode 100644 overlay/OPlusFrameworksResTarget/res/values/dimens.xml rename overlay/{frameworks/base/core/res => OPlusFrameworksResTarget}/res/xml/power_profile.xml (100%) create mode 100644 overlay/OPlusSettingsProviderResTarget/Android.bp create mode 100644 overlay/OPlusSettingsProviderResTarget/AndroidManifest.xml create mode 100644 overlay/OPlusSettingsProviderResTarget/res/values/defaults.xml create mode 100644 overlay/OPlusSystemUIResTarget/Android.bp create mode 100644 overlay/OPlusSystemUIResTarget/AndroidManifest.xml rename overlay/{frameworks/base/packages/SystemUI => OPlusSystemUIResTarget}/res/drawable/rounded_corner_bottom.xml (100%) rename overlay/{frameworks/base/packages/SystemUI => OPlusSystemUIResTarget}/res/drawable/rounded_corner_top.xml (100%) create mode 100644 overlay/OPlusSystemUIResTarget/res/values-land/dimens.xml create mode 100644 overlay/OPlusSystemUIResTarget/res/values/config.xml rename overlay/{frameworks/base/packages/SystemUI => OPlusSystemUIResTarget}/res/values/dimens.xml (58%) delete mode 100644 overlay/frameworks/base/core/res/res/values/dimens.xml delete mode 100644 overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values-land/dimens.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/config.xml diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..9515b25 --- /dev/null +++ b/Android.bp @@ -0,0 +1,2 @@ +soong_namespace { +} diff --git a/device.mk b/device.mk index a6ec61b..5cb739c 100644 --- a/device.mk +++ b/device.mk @@ -27,9 +27,13 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) # Overlays DEVICE_PACKAGE_OVERLAYS += \ - $(LOCAL_PATH)/overlay \ $(LOCAL_PATH)/overlay-lineage +PRODUCT_PACKAGES += \ + OPlusFrameworksResTarget \ + OPlusSettingsProviderResTarget \ + OPlusSystemUIResTarget + # Device uses high-density artwork where available PRODUCT_AAPT_CONFIG := normal PRODUCT_AAPT_PREF_CONFIG := xxhdpi @@ -46,6 +50,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ fstab.qcom +# Soong namespaces +PRODUCT_SOONG_NAMESPACES += \ + $(LOCAL_PATH) + PRODUCT_SHIPPING_API_LEVEL := 30 # Inherit from oneplus sm8250-common diff --git a/overlay/OPlusFrameworksResTarget/Android.bp b/overlay/OPlusFrameworksResTarget/Android.bp new file mode 100644 index 0000000..eabed42 --- /dev/null +++ b/overlay/OPlusFrameworksResTarget/Android.bp @@ -0,0 +1,10 @@ +// +// Copyright (C) 2022 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +runtime_resource_overlay { + name: "OPlusFrameworksResTarget", + sdk_version: "current", + device_specific: true, +} diff --git a/overlay/OPlusFrameworksResTarget/AndroidManifest.xml b/overlay/OPlusFrameworksResTarget/AndroidManifest.xml new file mode 100644 index 0000000..8deab80 --- /dev/null +++ b/overlay/OPlusFrameworksResTarget/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/OPlusFrameworksResTarget/res/values/config.xml similarity index 94% rename from overlay/frameworks/base/core/res/res/values/config.xml rename to overlay/OPlusFrameworksResTarget/res/values/config.xml index 2da01cb..124a6da 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/OPlusFrameworksResTarget/res/values/config.xml @@ -1,22 +1,10 @@ - + - - true @@ -32,16 +20,6 @@ 300 - - - 0 - - + + 0 + + - M -407 68.5 A 34 34 0 0 1 -475 68.5 A 34 34 0 0 1 -407 68.5 Z M -475,0 L -407,0 Z M -540,0 L -540,102.5 Z + + M -407 68.5 + A 34 34 0 0 1 -475 68.5 + A 34 34 0 0 1 -407 68.5 + Z + M -475,0 + L -407,0 + Z + M -540,0 + L -540,102.5 + Z + 87 + diff --git a/overlay/OPlusFrameworksResTarget/res/values/dimens.xml b/overlay/OPlusFrameworksResTarget/res/values/dimens.xml new file mode 100644 index 0000000..1075ac1 --- /dev/null +++ b/overlay/OPlusFrameworksResTarget/res/values/dimens.xml @@ -0,0 +1,18 @@ + + + + + + 28dp + 123px + 28dp + + + 8dp + + diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml similarity index 100% rename from overlay/frameworks/base/core/res/res/xml/power_profile.xml rename to overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml diff --git a/overlay/OPlusSettingsProviderResTarget/Android.bp b/overlay/OPlusSettingsProviderResTarget/Android.bp new file mode 100644 index 0000000..a83e80d --- /dev/null +++ b/overlay/OPlusSettingsProviderResTarget/Android.bp @@ -0,0 +1,10 @@ +// +// Copyright (C) 2022 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +runtime_resource_overlay { + name: "OPlusSettingsProviderResTarget", + sdk_version: "current", + device_specific: true, +} diff --git a/overlay/OPlusSettingsProviderResTarget/AndroidManifest.xml b/overlay/OPlusSettingsProviderResTarget/AndroidManifest.xml new file mode 100644 index 0000000..b1b461e --- /dev/null +++ b/overlay/OPlusSettingsProviderResTarget/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/overlay/OPlusSettingsProviderResTarget/res/values/defaults.xml b/overlay/OPlusSettingsProviderResTarget/res/values/defaults.xml new file mode 100644 index 0000000..069d541 --- /dev/null +++ b/overlay/OPlusSettingsProviderResTarget/res/values/defaults.xml @@ -0,0 +1,11 @@ + + + + + + OnePlus 8T + + diff --git a/overlay/OPlusSystemUIResTarget/Android.bp b/overlay/OPlusSystemUIResTarget/Android.bp new file mode 100644 index 0000000..a967e9e --- /dev/null +++ b/overlay/OPlusSystemUIResTarget/Android.bp @@ -0,0 +1,10 @@ +// +// Copyright (C) 2022 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +runtime_resource_overlay { + name: "OPlusSystemUIResTarget", + sdk_version: "current", + device_specific: true, +} diff --git a/overlay/OPlusSystemUIResTarget/AndroidManifest.xml b/overlay/OPlusSystemUIResTarget/AndroidManifest.xml new file mode 100644 index 0000000..4de1645 --- /dev/null +++ b/overlay/OPlusSystemUIResTarget/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/overlay/OPlusSystemUIResTarget/res/drawable/rounded_corner_bottom.xml similarity index 100% rename from overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml rename to overlay/OPlusSystemUIResTarget/res/drawable/rounded_corner_bottom.xml diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml b/overlay/OPlusSystemUIResTarget/res/drawable/rounded_corner_top.xml similarity index 100% rename from overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml rename to overlay/OPlusSystemUIResTarget/res/drawable/rounded_corner_top.xml diff --git a/overlay/OPlusSystemUIResTarget/res/values-land/dimens.xml b/overlay/OPlusSystemUIResTarget/res/values-land/dimens.xml new file mode 100644 index 0000000..2cf37d8 --- /dev/null +++ b/overlay/OPlusSystemUIResTarget/res/values-land/dimens.xml @@ -0,0 +1,17 @@ + + + + + + 48px + + + 28px + + + 0px + + diff --git a/overlay/OPlusSystemUIResTarget/res/values/config.xml b/overlay/OPlusSystemUIResTarget/res/values/config.xml new file mode 100644 index 0000000..2c742f4 --- /dev/null +++ b/overlay/OPlusSystemUIResTarget/res/values/config.xml @@ -0,0 +1,14 @@ + + + + + + true + + + 92 + + diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/OPlusSystemUIResTarget/res/values/dimens.xml similarity index 58% rename from overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml rename to overlay/OPlusSystemUIResTarget/res/values/dimens.xml index dc52dd3..fce644b 100644 --- a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/overlay/OPlusSystemUIResTarget/res/values/dimens.xml @@ -1,21 +1,10 @@ + 97px @@ -33,4 +22,5 @@ @dimen/status_bar_padding_start + diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml deleted file mode 100644 index 0cdaf2d..0000000 --- a/overlay/frameworks/base/core/res/res/values/dimens.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - 28dp - 123px - 28dp - - - 8dp - diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml deleted file mode 100644 index 6cae99f..0000000 --- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - OnePlus 8T - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-land/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values-land/dimens.xml deleted file mode 100644 index 2e0922d..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values-land/dimens.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - 48px - - - 28px - - - 0px - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml deleted file mode 100644 index a71e657..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - true - - - 92 -