Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff87fbed authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge branch '1573devices-a14-otter_switch_cust' into 'a14' 

otter: Allow customizing extra button long press action

See merge request !13
parents bfd56a80 84187ac8

BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ VENDOR_SECURITY_PATCH := 2024-10-05 


# SEPolicy

include device/qcom/sepolicy_vndr/SEPolicy.mk

SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private

BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor



# Verified Boot

device.mk

+4 −4
Original line number Diff line number Diff line
@@ -213,10 +213,6 @@ PRODUCT_ENABLE_UFFD_GC := false 
PRODUCT_PACKAGES += \

    android.hardware.hardware_keystore.km41.xml



# Keyhandler

PRODUCT_PACKAGES += \

    KeyHandler



# Light

PRODUCT_PACKAGES += \

    android.hardware.light-service.otter
@@ -270,6 +266,10 @@ PRODUCT_PACKAGES += \ 
    WifiResCommon \

    WifiResTarget



# Parts

PRODUCT_PACKAGES += \

    OtterParts



# Partitions

PRODUCT_USE_DYNAMIC_PARTITIONS := true

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

+1 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <!-- The name of the package that will hold the default device keyhandler role. -->

    <string name="config_deviceKeyHandler" translatable="false">org.lineageos.settings.device</string>

    <string name="config_deviceKeyHandler" translatable="false">org.lineageos.settings</string>

</resources>

overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -61,11 +61,11 @@ 


    <!-- Paths to the libraries that contain device specific key handlers -->

    <string-array name="config_deviceKeyHandlerLibs" translatable="false">

        <item>/system_ext/app/KeyHandler/KeyHandler.apk</item>

        <item>/system_ext/priv-app/OtterParts/OtterParts.apk</item>

    </string-array>



    <!-- Names of the key handler classes -->

    <string-array name="config_deviceKeyHandlerClasses" translatable="false">

        <item>org.lineageos.settings.device.KeyHandler</item>

        <item>org.lineageos.settings.switchcust.KeyHandler</item>

    </string-array>

</resources>

parts/Android.bp

0 → 100644
+34 −0
Original line number Diff line number Diff line 
android_app {

    name: "OtterParts",

    defaults: ["SettingsLibDefaults"],



    srcs: [

        "src/**/*.java",

    ],



    resource_dirs: ["res"],



    required: ["privapp-permissions-otterparts"],



    certificate: "platform",

    platform_apis: true,

    privileged: true,

    system_ext_specific: true,



    static_libs: [

        "androidx.core_core",

        "androidx.preference_preference",

    ],



    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },

}



prebuilt_etc {

    name: "privapp-permissions-otterparts",

    src: "privapp-permissions-otterparts.xml",

    filename: "privapp-permissions-org.lineageos.settings.xml",

    system_ext_specific: true,

    sub_dir: "permissions",

}