diff options
| -rw-r--r-- | AndroidProducts.mk | 8 | ||||
| -rw-r--r-- | BoardConfig.mk | 2 | ||||
| -rw-r--r-- | aicp.dependencies (renamed from lineage.dependencies) | 2 | ||||
| -rw-r--r-- | aicp_ocean.mk (renamed from lineage_ocean.mk) | 7 | ||||
| -rw-r--r-- | device.mk | 6 | ||||
| -rw-r--r-- | overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml | 72 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 56 | ||||
| -rw-r--r-- | product.prop | 29 | ||||
| -rw-r--r-- | properties.mk | 37 |
9 files changed, 97 insertions, 122 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 7a15269..3f13765 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,9 +15,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_ocean.mk + $(LOCAL_DIR)/aicp_ocean.mk COMMON_LUNCH_CHOICES := \ - lineage_ocean-eng \ - lineage_ocean-user \ - lineage_ocean-userdebug + aicp_ocean-eng \ + aicp_ocean-user \ + aicp_ocean-userdebug diff --git a/BoardConfig.mk b/BoardConfig.mk index e7802ff..87e07be 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -42,5 +42,7 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 603979776 # 589824 * 1024 mmcblk0p60-6 # Soong namespaces PRODUCT_SOONG_NAMESPACES += $(DEVICE_PATH) +# Properties +TARGET_PRODUCT_PROP += $(DEVICE_PATH)/product.prop # inherit from the proprietary version include vendor/motorola/ocean/BoardConfigVendor.mk diff --git a/lineage.dependencies b/aicp.dependencies index ae91829..8ac89a5 100644 --- a/lineage.dependencies +++ b/aicp.dependencies @@ -1,6 +1,6 @@ [ { - "repository": "android_device_motorola_sdm632-common", + "repository": "AICP/device_motorola_sdm632-common", "target_path": "device/motorola/sdm632-common" } ] diff --git a/lineage_ocean.mk b/aicp_ocean.mk index 3c41d9d..f831dfd 100644 --- a/lineage_ocean.mk +++ b/aicp_ocean.mk @@ -19,8 +19,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk) -# Inherit some common Lineage stuff -$(call inherit-product, vendor/lineage/config/common_full_phone.mk) +# Inherit some common AICP stuff +$(call inherit-product, vendor/aicp/config/common_full_phone.mk) # Inherit from ocean device $(call inherit-product, $(LOCAL_PATH)/device.mk) @@ -32,11 +32,12 @@ PRODUCT_VENDOR_PROPERTY_BLACKLIST := \ PRODUCT_BRAND := motorola PRODUCT_DEVICE := ocean PRODUCT_MANUFACTURER := motorola -PRODUCT_NAME := lineage_ocean +PRODUCT_NAME := aicp_ocean PRODUCT_MODEL := moto g(7) power PRODUCT_BUILD_PROP_OVERRIDES += \ PRODUCT_NAME=ocean \ + DEVICE_MAINTAINERS="Anton Klimanov (zinstack625)" \ PRIVATE_BUILD_DESC="ocean-user 9 PPO29.114-134 fee207 release-keys" # Set BUILD_FINGERPRINT variable to be picked up by both system and vendor build.prop @@ -17,13 +17,9 @@ # Vendor blobs $(call inherit-product, vendor/motorola/ocean/ocean-vendor.mk) -# Properties --include $(LOCAL_PATH)/properties.mk - # Overlays DEVICE_PACKAGE_OVERLAYS += \ - $(LOCAL_PATH)/overlay \ - $(LOCAL_PATH)/overlay-lineage + $(LOCAL_PATH)/overlay PRODUCT_ENFORCE_RRO_TARGETS := * PRODUCT_PACKAGES += \ diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml deleted file mode 100644 index 4c9cd66..0000000 --- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2015-2016 The CyanogenMod 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> - <!-- All the capabilities of the LEDs on this device, stored as a bit field. - This integer should equal the sum of the corresponding value for each - of the following capabilities present: - - LIGHTS_RGB_NOTIFICATION_LED = 1 - LIGHTS_RGB_BATTERY_LED = 2 - LIGHTS_MULTIPLE_NOTIFICATION_LED = 4 (deprecated) - LIGHTS_PULSATING_LED = 8 - LIGHTS_SEGMENTED_BATTERY_LED = 16 - LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS = 32 - LIGHTS_BATTERY_LED = 64 - LIGHTS_ADJUSTABLE_BATTERY_LED_BRIGHTNESS = 128 - - For example, a device support pulsating, RGB notification and - battery LEDs would set this config to 11. --> - <integer name="config_deviceLightCapabilities" translatable="false">232</integer> - - <!-- Default value for proximity check on screen wake - NOTE ! - Enable for devices that have a fast response proximity sensor (ideally < 300ms)--> - <bool name="config_proximityCheckOnWake">true</bool> - <bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool> - - <!-- Hardware keys present on the device, stored as a bit field. - This integer should equal the sum of the corresponding value for each - of the following keys present: - 1 - Home - 2 - Back - 4 - Menu - 8 - Assistant (search) - 16 - App switch - 32 - Camera - 64 - Volume rocker - For example, a device with Home, Back and Menu keys would set this - config to 7. --> - <integer name="config_deviceHardwareKeys">64</integer> - - <!-- Control the behavior when the user long presses the app switch button. - 0 - Nothing - 1 - Menu key - 2 - Recent apps view in SystemUI - 3 - Launch assist intent - 4 - Voice Search - 5 - In-app Search - 6 - Launch camera - 7 - Sleep - 8 - Last app - 9 - Toggle split screen - This needs to match the enums in - sdk/src/java/org/lineageos/internal/util/DeviceKeysConstants.java. - --> - <integer name="config_longPressOnAppSwitchBehavior">1</integer> - - <!-- Whether device has screen with higher aspect ratio --> - <bool name="config_haveHigherAspectRatioScreen">true</bool> - - <!-- Whether device has a notch --> - <bool name="config_haveNotch">true</bool> -</resources> diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 9f5cb31..5f245a8 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -2,6 +2,7 @@ <!-- /* ** Copyright 2013, The Android Open Source Project +** Copyright (C) 2015-2016 The CyanogenMod Project ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. @@ -38,4 +39,59 @@ <dimen name="status_bar_height_portrait">53.0px</dimen> <dimen name="status_bar_height_landscape">24.0dp</dimen> + <!-- All the capabilities of the LEDs on this device, stored as a bit field. + This integer should equal the sum of the corresponding value for each + of the following capabilities present: + + LIGHTS_RGB_NOTIFICATION_LED = 1 + LIGHTS_RGB_BATTERY_LED = 2 + LIGHTS_MULTIPLE_NOTIFICATION_LED = 4 (deprecated) + LIGHTS_PULSATING_LED = 8 + LIGHTS_SEGMENTED_BATTERY_LED = 16 + LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS = 32 + LIGHTS_BATTERY_LED = 64 + LIGHTS_ADJUSTABLE_BATTERY_LED_BRIGHTNESS = 128 + + For example, a device support pulsating, RGB notification and + battery LEDs would set this config to 11. --> + <integer name="config_deviceLightCapabilities" translatable="false">232</integer> + + <!-- Default value for proximity check on screen wake + NOTE ! - Enable for devices that have a fast response proximity sensor (ideally < 300ms)--> + <bool name="config_proximityCheckOnWake">true</bool> + <bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool> + + <!-- Hardware keys present on the device, stored as a bit field. + This integer should equal the sum of the corresponding value for each + of the following keys present: + 1 - Home + 2 - Back + 4 - Menu + 8 - Assistant (search) + 16 - App switch + 32 - Camera + 64 - Volume rocker + For example, a device with Home, Back and Menu keys would set this + config to 7. --> + <integer name="config_deviceHardwareKeys">64</integer> + + <!-- Control the behavior when the user long presses the app switch button. + 0 - Nothing + 1 - Menu key + 2 - Recent apps view in SystemUI + 3 - Launch assist intent + 4 - Voice Search + 5 - In-app Search + 6 - Launch camera + 7 - Sleep + 8 - Last app + 9 - Toggle split screen + This needs to match the enums in + sdk/src/java/org/lineageos/internal/util/DeviceKeysConstants.java. + --> + <integer name="config_longPressOnAppSwitchBehavior">1</integer> + + <!-- Disable LiveDisplay --> + <bool name="config_liveDisplayAvailable">false</bool> + </resources> diff --git a/product.prop b/product.prop new file mode 100644 index 0000000..47e9ab7 --- /dev/null +++ b/product.prop @@ -0,0 +1,29 @@ +# Audio +persist.vendor.audio.calfile0=/vendor/etc/acdbdata/na/Bluetooth_cal.acdb +persist.vendor.audio.calfile1=/vendor/etc/acdbdata/na/General_cal.acdb +persist.vendor.audio.calfile2=/vendor/etc/acdbdata/na/Global_cal.acdb +persist.vendor.audio.calfile3=/vendor/etc/acdbdata/na/Handset_cal.acdb +persist.vendor.audio.calfile4=/vendor/etc/acdbdata/na/Hdmi_cal.acdb +persist.vendor.audio.calfile5=/vendor/etc/acdbdata/na/Headset_cal.acdb +persist.vendor.audio.calfile6=/vendor/etc/acdbdata/na/Speaker_cal.acdb + +# Sensors +ro.hardware.sensors=ocean +ro.vendor.sensors.amd=false +ro.vendor.sensors.facing=false +ro.vendor.sensors.mot_detect=true +ro.vendor.sensors.mot_ltv=true +ro.vendor.sensors.pedometer=false +ro.vendor.sensors.pmd=false +ro.vendor.sensors.rmd=false +ro.vendor.sensors.scrn_ortn=false +ro.vendor.sensors.sta_detect=true +ro.vendor.sensors.glance_approach=false +ro.vendor.sensors.glance_cover_to_wake=false +ro.vendor.sdk.sensors.gestures=false + +# Camera +persist.vendor.camera.expose.aux=1 + +# Display +ro.support_hide_display_cutout=true diff --git a/properties.mk b/properties.mk deleted file mode 100644 index 793e2f6..0000000 --- a/properties.mk +++ /dev/null @@ -1,37 +0,0 @@ -# -# vendor props for ocean -# - -# Audio -PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.audio.calfile0=/vendor/etc/acdbdata/na/Bluetooth_cal.acdb \ - persist.vendor.audio.calfile1=/vendor/etc/acdbdata/na/General_cal.acdb \ - persist.vendor.audio.calfile2=/vendor/etc/acdbdata/na/Global_cal.acdb \ - persist.vendor.audio.calfile3=/vendor/etc/acdbdata/na/Handset_cal.acdb \ - persist.vendor.audio.calfile4=/vendor/etc/acdbdata/na/Hdmi_cal.acdb \ - persist.vendor.audio.calfile5=/vendor/etc/acdbdata/na/Headset_cal.acdb \ - persist.vendor.audio.calfile6=/vendor/etc/acdbdata/na/Speaker_cal.acdb - -# Sensors -PRODUCT_PROPERTY_OVERRIDES += \ - ro.hardware.sensors=ocean \ - ro.vendor.sensors.amd=false \ - ro.vendor.sensors.facing=false \ - ro.vendor.sensors.mot_detect=true \ - ro.vendor.sensors.mot_ltv=true \ - ro.vendor.sensors.pedometer=false \ - ro.vendor.sensors.pmd=false \ - ro.vendor.sensors.rmd=false \ - ro.vendor.sensors.scrn_ortn=false \ - ro.vendor.sensors.sta_detect=true \ - ro.vendor.sensors.glance_approach=false \ - ro.vendor.sensors.glance_cover_to_wake=false \ - ro.vendor.sdk.sensors.gestures=false - -# Camera -PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.camera.expose.aux=1 - -# Cutout -PRODUCT_PRODUCT_PROPERTIES += \ - ro.support_hide_display_cutout=true |