Skip to content

Commit 4e7cf80

Browse files
committed
avicii: SuperiorOS Bringup
- Included all required configs - Dropped lineage based stuffs which isn't available on Superior - Change Screen density to 420 - Included superior dependencies Signed-off-by: S I P U N <[email protected]>
1 parent 7c25804 commit 4e7cf80

File tree

16 files changed

+154
-60
lines changed

16 files changed

+154
-60
lines changed

AndroidProducts.mk

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#
1616

1717
PRODUCT_MAKEFILES := \
18-
$(LOCAL_DIR)/lineage_avicii.mk
18+
$(LOCAL_DIR)/superior_avicii.mk
1919

2020
COMMON_LUNCH_CHOICES := \
21-
lineage_avicii-eng \
22-
lineage_avicii-user \
23-
lineage_avicii-userdebug
21+
superior_avicii-eng \
22+
superior_avicii-user \
23+
superior_avicii-userdebug

BoardConfig.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ TARGET_SYSTEM_EXT_PROP += $(DEVICE_PATH)/system_ext.prop
6464
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
6565

6666
# Display
67-
TARGET_SCREEN_DENSITY := 440
67+
TARGET_SCREEN_DENSITY := 420
6868
TARGET_USES_COLOR_METADATA := true
6969
TARGET_USES_DISPLAY_RENDER_INTENTS := true
7070
TARGET_USES_DRM_PP := true
@@ -86,7 +86,7 @@ TARGET_SURFACEFLINGER_UDFPS_LIB := //hardware/oplus:libudfps_extension.oplus
8686
DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
8787
$(DEVICE_PATH)/device_framework_matrix.xml \
8888
hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \
89-
vendor/lineage/config/device_framework_matrix.xml
89+
vendor/superior/config/device_framework_matrix.xml
9090
DEVICE_MATRIX_FILE := $(DEVICE_PATH)/compatibility_matrix.xml
9191
DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
9292
ODM_MANIFEST_FILES := $(DEVICE_PATH)/manifest_odm.xml
@@ -114,7 +114,7 @@ BOARD_KERNEL_SEPARATED_DTBO := true
114114
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
115115
BOARD_RAMDISK_USE_LZ4 := true
116116
TARGET_KERNEL_ADDITIONAL_FLAGS := BRAND_SHOW_FLAG=oneplus
117-
TARGET_KERNEL_SOURCE := kernel/oneplus/sm7250
117+
TARGET_KERNEL_SOURCE := kernel/oneplus/avicii
118118
TARGET_KERNEL_CONFIG := vendor/lito-perf_defconfig vendor/debugfs.config
119119

120120
# Lineage Health

device.mk

+1-5
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,6 @@ PRODUCT_PACKAGES += \
261261
PRODUCT_PACKAGES += \
262262
vendor.lineage.health-service.default
263263

264-
# LiveDisplay
265-
PRODUCT_PACKAGES += \
266-
267-
268264
# Media
269265
PRODUCT_COPY_FILES += \
270266
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
@@ -322,7 +318,7 @@ $(call inherit-product, hardware/oplus/overlay/generic/generic.mk)
322318
$(call inherit-product, hardware/oplus/overlay/qssi/qssi.mk)
323319

324320
DEVICE_PACKAGE_OVERLAYS += \
325-
$(LOCAL_PATH)/overlay-lineage
321+
$(LOCAL_PATH)/overlay-superior
326322

327323
PRODUCT_ENFORCE_RRO_TARGETS := *
328324
PRODUCT_PACKAGES += \

lineage.dependencies

-10
This file was deleted.

overlay-lineage/frameworks/base/packages/SystemUI/res/values/config.xml

-11
This file was deleted.

overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml

-10
This file was deleted.

overlay-lineage/packages/apps/Settings/res/values/config.xml

-11
This file was deleted.

overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml overlay-superior/frameworks/base/core/res/res/values/config.xml

+25-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@
1313
<!-- Paths to the libraries that contain device specific key handlers -->
1414
<string-array name="config_deviceKeyHandlerLibs" translatable="false">
1515
<item>/system_ext/app/KeyHandler/KeyHandler.apk</item>
16-
<item>/system_ext/priv-app/LineageParts/LineageParts.apk</item>
1716
</string-array>
1817

1918
<!-- Names of the key handler classes -->
2019
<string-array name="config_deviceKeyHandlerClasses" translatable="false">
2120
<item>org.lineageos.settings.device.KeyHandler</item>
22-
<item>org.lineageos.lineageparts.gestures.KeyHandler</item>
2321
</string-array>
2422

2523
<!-- Hardware keys present on the device, stored as a bit field.
@@ -67,4 +65,28 @@
6765
<item>org.thunderdog.challegram</item>
6866
<item>us.zoom.videomeetings</item>
6967
</string-array>
70-
</resources>
68+
69+
<!-- Whether device has physical tri state switch -->
70+
<bool name="config_hasAlertSlider">true</bool>
71+
72+
<!-- The location of the devices physical tri state switch
73+
0: Left side
74+
1: Right side -->
75+
<integer name="config_alertSliderLocation">1</integer>
76+
77+
<!-- Does the device have a notification led -->
78+
<bool name="config_hasNotificationLed">false</bool>
79+
80+
<!-- Whether devices suports in-display fingerprint when screen is off -->
81+
<bool name="config_supportsScreenOffUdfps">true</bool>
82+
83+
<!-- Pocket Lock -->
84+
<bool name="config_pocketModeSupported">true</bool>
85+
86+
<!-- Whether device has warp charging support -->
87+
<bool name="config_hasWarpCharger">true</bool>
88+
89+
<!-- Path to warp charging status file -->
90+
<string name="config_oemFastChargerStatusPath" translatable="false">
91+
/sys/class/oplus_chg/battery/voocchg_ing"</string>
92+
</resources>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (C) 2022 The LineageOS Project
4+
SPDX-License-Identifier: Apache-2.0
5+
-->
6+
<resources>
7+
8+
<!-- Color of the UDFPS Pressed view -->
9+
<color name="config_udfpsColor">#ccccac</color>
10+
11+
<!-- Allow devices override audio panel location to the left side -->
12+
<bool name="config_audioPanelOnLeftSide">true</bool>
13+
14+
<!-- Max visible notification icons -->
15+
<integer name="config_maxVisibleNotificationIcons">3</integer>
16+
<integer name="config_maxVisibleNotificationIconsOnLock">4</integer>
17+
18+
<!-- If true, the display will be shifted around in ambient mode. -->
19+
<bool name="config_enableBurnInProtection">true</bool>
20+
21+
<!-- Specifies the maximum burn-in offset displacement from the center. If -1, no maximum value
22+
will be used. -->
23+
<integer name="config_burnInProtectionMaxRadius">-1</integer>
24+
25+
<!-- Specifies the minimum burn-in offset horizontally. -->
26+
<integer name="config_burnInProtectionMinHorizontalOffset">-15</integer>
27+
28+
<!-- Specifies the maximum burn-in offset horizontally. -->
29+
<integer name="config_burnInProtectionMaxHorizontalOffset">15</integer>
30+
31+
<!-- Specifies the minimum burn-in offset vertically. -->
32+
<integer name="config_burnInProtectionMinVerticalOffset">-40</integer>
33+
34+
<!-- Specifies the maximum burn-in offset vertically. -->
35+
<integer name="config_burnInProtectionMaxVerticalOffset">40</integer>
36+
37+
<!-- Burn-in protection -->
38+
<bool name="config_statusBarBurnInProtection">true</bool>
39+
<integer name="config_shift_interval">40</integer>
40+
41+
<!-- The battery current divider, some kernel report current value in mA other in µA.
42+
Leave 1 if you have mA, put 1000 if you have µA-->
43+
<integer name="config_battCurrentDivider" translatable="false">1</integer>
44+
45+
<!-- The CPU temperature divider, if needed -->
46+
<integer name="config_cpuTempDivider" translatable="false">1000</integer>
47+
</resources>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (C) 2022 The SuperiorOS Project
4+
SPDX-License-Identifier: Apache-2.0
5+
-->
6+
<resources>
7+
8+
<!-- Alert Slider UI for OnePlus Nord-->
9+
<dimen name="tri_state_down_dialog_position_l">503px</dimen>
10+
<dimen name="tri_state_middle_dialog_position_l">503px</dimen>
11+
<dimen name="tri_state_up_dialog_position_l">503px</dimen>
12+
<dimen name="tri_state_up_dialog_position_deep">24px</dimen>
13+
<dimen name="tri_state_up_dialog_position_deep_land">21px</dimen>
14+
<dimen name="tri_state_down_dialog_position">627px</dimen>
15+
<dimen name="tri_state_middle_dialog_position">480px</dimen>
16+
<dimen name="tri_state_up_dialog_position">336px</dimen>
17+
18+
<!-- Udfps animation -->
19+
<dimen name="udfps_animation_size">176dp</dimen>
20+
<dimen name="udfps_animation_offset">-2dp</dimen>
21+
22+
</resources>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (C) 2022 The LineageOS Project
4+
SPDX-License-Identifier: Apache-2.0
5+
-->
6+
<resources>
7+
8+
<!-- Max network scan search time in seconds -->
9+
<integer name="config_network_scan_helper_max_search_time_sec">254</integer>
10+
11+
<!-- Defines the location of the fingerprint sensor on the device
12+
0 = back
13+
1 = front
14+
2 = left side
15+
3 = right side
16+
-->
17+
<integer name="config_fingerprintSensorLocation">1</integer>
18+
19+
<!-- Whether to show min/max refresh rate in display settings -->
20+
<bool name="config_show_refresh_rate_controls">true</bool>
21+
<bool name="config_supports_dynamic_refresh_rate_controls">false</bool>
22+
23+
</resources>

superior.dependencies

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[
2+
{
3+
"repository": "hardware_oplus",
4+
"target_path": "hardware/oplus"
5+
},
6+
{
7+
"repository": "kernel_oneplus_avicii",
8+
"target_path": "kernel/oneplus/avicii"
9+
},
10+
{
11+
"repository": "vendor_oneplus_avicii",
12+
"target_path": "vendor/oneplus/avicii",
13+
"remote":"superior-gitlab"
14+
},
15+
{
16+
"repository":"LineageOS/android_packages_resources_devicesettings",
17+
"target_path":"packages/resources/devicesettings",
18+
"branch":"lineage-21.0",
19+
"remote":"github"
20+
}
21+
]

lineage_avicii.mk superior_avicii.mk

+8-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
1111
# Inherit from avicii device
1212
$(call inherit-product, device/oneplus/avicii/device.mk)
1313

14-
# Inherit some common Lineage stuff.
15-
$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
14+
# Inherit some common Superior stuff.
15+
$(call inherit-product, vendor/superior/config/common.mk)
1616

17-
PRODUCT_NAME := lineage_avicii
17+
# Additional stuff for this product.
18+
TARGET_BOOT_ANIMATION_RES := 1080
19+
TARGET_SUPPORTS_BLUR := true
20+
TARGET_GAPPS_ARCH := arm64
21+
22+
PRODUCT_NAME := superior_avicii
1823
PRODUCT_DEVICE := avicii
1924
PRODUCT_MANUFACTURER := OnePlus
2025
PRODUCT_BRAND := OnePlus

0 commit comments

Comments
 (0)