berlin --> berlna

Signed-off-by: Andrew Hexen <SyberHexen@gmail.com>
Change-Id: I45420899d75fa8a29642cd8eec1d9ec8b34b8f8b
This commit is contained in:
Andrew Hexen 2023-01-26 02:49:15 -08:00
parent c862e79605
commit 0140955551
No known key found for this signature in database
GPG key ID: 8A690B4B0CD461A2
38 changed files with 307 additions and 158 deletions

View file

@ -16,6 +16,6 @@
LOCAL_PATH := $(call my-dir)
ifeq ($(TARGET_DEVICE),berlin)
ifeq ($(TARGET_DEVICE),berlna)
include $(call all-makefiles-under,$(LOCAL_PATH))
endif
endif

View file

@ -15,9 +15,9 @@
#
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/lineage_berlin.mk
$(LOCAL_DIR)/lineage_berlna.mk
COMMON_LUNCH_CHOICES := \
lineage_berlin-user \
lineage_berlin-userdebug \
lineage_berlin-eng
lineage_berlna-user \
lineage_berlna-userdebug \
lineage_berlna-eng

View file

@ -14,23 +14,23 @@
# limitations under the License.
#
DEVICE_PATH := device/motorola/berlin
DEVICE_PATH := device/motorola/berlna
# Inherit from motorola sm7325-common
include device/motorola/sm7325-common/BoardConfigCommon.mk
# Bootloader
TARGET_BOOTLOADER_BOARD_NAME := berlin
TARGET_BOOTLOADER_BOARD_NAME := berlna
# Bluetooth
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
# HIDL
DEVICE_MANIFEST_YUPIK_FILES += $(DEVICE_PATH)/manifest_berlin.xml
DEVICE_MANIFEST_YUPIK_FILES += $(DEVICE_PATH)/manifest_berlna.xml
# Kernel
BOARD_KERNEL_CMDLINE += androidboot.hab.product=berlin
TARGET_KERNEL_CONFIG += vendor/lineage_berlin.config
BOARD_KERNEL_CMDLINE += androidboot.hab.product=berlna
TARGET_KERNEL_CONFIG += vendor/lineage_berlna.config
# Kernel Modules
BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load))
@ -39,14 +39,14 @@ BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVIC
BOOT_KERNEL_MODULES := $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD)
# Partitions
BOARD_USERDATAIMAGE_PARTITION_SIZE := 102247673856
BOARD_USERDATAIMAGE_PARTITION_SIZE := 237371371520
ifneq ($(WITH_GMS),true)
BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 1073741824
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 898367488
BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE := 1073741824
endif
BOARD_MOT_DP_GROUP_SIZE := 7109345280
BOARD_SUPER_PARTITION_SIZE := 14227079168
BOARD_MOT_DP_GROUP_SIZE := 7916748800
BOARD_SUPER_PARTITION_SIZE := 15854469120
# Power
TARGET_TAP_TO_WAKE_NODE := "/sys/devices/platform/soc/a94000.i2c/i2c-2/2-0049/double_click"
@ -59,7 +59,7 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90
# Security
VENDOR_SECURITY_PATCH := 2022-11-01
VENDOR_SECURITY_PATCH := 2023-01-01
# inherit from the proprietary version
include vendor/motorola/berlin/BoardConfigVendor.mk
include vendor/motorola/berlna/BoardConfigVendor.mk

View file

@ -22,7 +22,7 @@
#ifndef _BDROID_BUILDCFG_H
#define _BDROID_BUILDCFG_H
#define BTM_DEF_LOCAL_NAME "Motorola Edge 20"
#define BTM_DEF_LOCAL_NAME "Motorola Edge (2021)"
// Disables read remote device feature
#define MAX_ACL_CONNECTIONS 16
#define MAX_L2CAP_CHANNELS 16

View file

@ -0,0 +1,9 @@
#
# Egis Touch sensor driver
#
#
device.internal = 1
keyboard.layout = uinput-egis
keyboard.builtIn = 1
keyboard.orientationAware = 1

View file

@ -0,0 +1,9 @@
#
# ETS320 Touch sensor driver
#
# ets320 "finger present"
key 618 SYSTEM_NAVIGATION_UP
key 619 SYSTEM_NAVIGATION_DOWN
key 622 SYSTEM_NAVIGATION_LEFT

View file

@ -33,9 +33,9 @@ $(call inherit-product, device/motorola/sm7325-common/sm7325.mk)
# Overlay
PRODUCT_PACKAGES += \
FrameworksResBerlin \
LineageSystemUIBerlin \
SystemUIResBerlin
FrameworksResBerlna \
LineageSystemUIBerlna \
SystemUIResBerlna
# Audio
PRODUCT_COPY_FILES += \
@ -49,11 +49,12 @@ PRODUCT_COPY_FILES += \
# Fingerprint
PRODUCT_PACKAGES += \
android.hardware.biometrics.fingerprint@2.1-service.berlin
android.hardware.biometrics.fingerprint@2.1-service.berlna
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/idc/uinput_nav.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput_nav.idc \
$(LOCAL_PATH)/configs/keylayout/uinput_nav.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput_nav.kl
$(foreach f,$(wildcard $(LOCAL_PATH)/configs/idc/*.idc),\
$(eval PRODUCT_COPY_FILES += $(f):$(TARGET_COPY_OUT_VENDOR)/usr/idc/$(notdir $f)))
$(foreach f,$(wildcard $(LOCAL_PATH)/configs/keylayout/*.kl),\
$(eval PRODUCT_COPY_FILES += $(f):$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/$(notdir $f)))
# Init
$(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/etc/init/hw/*.rc),\
@ -65,7 +66,7 @@ $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/bin/*.sh),\
# Lineage Touch
PRODUCT_PACKAGES += \
vendor.lineage.touch@1.0-service.berlin
vendor.lineage.touch@1.0-service.berlna
# Media
PRODUCT_COPY_FILES += \
@ -90,4 +91,4 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml
# Inherit from vendor blobs
$(call inherit-product, vendor/motorola/berlin/berlin-vendor.mk)
$(call inherit-product, vendor/motorola/berlna/berlna-vendor.mk)

View file

@ -14,7 +14,7 @@ fi
set -e
export DEVICE=berlin
export DEVICE=berlna
export DEVICE_COMMON=sm7325-common
export VENDOR=motorola

View file

@ -13,9 +13,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
cc_binary {
name: "android.hardware.biometrics.fingerprint@2.1-service.berlin",
vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.berlin.xml"],
init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.berlin.rc"],
name: "android.hardware.biometrics.fingerprint@2.1-service.berlna",
vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.berlna.xml"],
init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.berlna.rc"],
defaults: ["hidl_defaults"],
relative_install_path: "hw",
srcs: ["service.cpp", "BiometricsFingerprint.cpp"],

View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.berlin"
#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.berlna"
#include "BiometricsFingerprint.h"

View file

@ -1,4 +1,4 @@
service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.berlin
service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.berlna
interface android.hardware.biometrics.fingerprint@2.1::IBiometricsFingerprint default
oneshot
# "class hal" causes a race condition on some devices due to files created

View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.berlin"
#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.berlna"
#include <android/log.h>
#include <hidl/HidlTransportSupport.h>

View file

@ -18,22 +18,22 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# Inherit from berlin device
$(call inherit-product, device/motorola/berlin/device.mk)
# Inherit from berlna device
$(call inherit-product, device/motorola/berlna/device.mk)
# Inherit some common Lineage stuff.
$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
PRODUCT_NAME := lineage_berlin
PRODUCT_DEVICE := berlin
PRODUCT_NAME := lineage_berlna
PRODUCT_DEVICE := berlna
PRODUCT_MANUFACTURER := motorola
PRODUCT_BRAND := motorola
PRODUCT_MODEL := motorola edge 20
PRODUCT_MODEL := motorola edge (2021)
PRODUCT_GMS_CLIENTID_BASE := android-motorola
PRODUCT_BUILD_PROP_OVERRIDES += \
TARGET_PRODUCT=berlin_retail \
PRIVATE_BUILD_DESC="berlin_global-user 12 S1RGS32.53-18-22-11 2367ac-b6e7c release-keys"
TARGET_PRODUCT=berlna_global \
PRIVATE_BUILD_DESC="berlna_global-user 12 S1RMS32.48-18-11-2-19 5e5bb-394ae release-keys"
BUILD_FINGERPRINT := motorola/berlin_global/berlin:12/S1RGS32M.53-18-22-11/b6e7c:user/release-keys
BUILD_FINGERPRINT := motorola/berlna_global/berlna:12/S1RMS32M.68-43-16-3/394ae:user/release-keys

View file

@ -11,9 +11,5 @@
<name>ISunlightEnhancement</name>
<instance>default</instance>
</interface>
<interface>
<name>IAntiFlicker</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

View file

@ -99,5 +99,8 @@ blocklist utags
#
# Motorola product module block list
#
blocklist goodix_fod_mmi
blocklist ets_fps_mmi
blocklist camera
blocklist aw8695

View file

@ -1,80 +1,212 @@
stub_dlkm.ko
machine_dlkm.ko
fc2580.ko
mt2063.ko
tda9887.ko
apr_dlkm.ko
mxl5005s.ko
xc4000.ko
tuner-xc2028.ko
radio-i2c-rtc6226-qca.ko
max2165.ko
qt1010.ko
slimbus-ngd.ko
llcc_perfmon.ko
platform_dlkm.ko
wsa883x_dlkm.ko
tea5767.ko
msi001.ko
qm1d1c0042.ko
fc0013.ko
btpower.ko
tua9001.ko
m88rs6000t.ko
qcom_edac.ko
fc0011.ko
wcd937x_dlkm.ko
pinctrl_lpi_dlkm.ko
fc0012.ko
aw882xx_k504.ko
mt20xx.ko
xc5000.ko
leds-qti-tri-led.ko
msm_dma_iommu_mapping.ko
phy-generic.ko
wcd9xxx_dlkm.ko
bt_fm_slim.ko
tea5761.ko
rx_macro_dlkm.ko
pinctrl_wcd_dlkm.ko
wsa_macro_dlkm.ko
adsp_loader_dlkm.ko
wcd938x_dlkm.ko
q6_dlkm.ko
hdmi_dlkm.ko
swr_haptics_dlkm.ko
tda18218.ko
msm_drm.ko
tda18212.ko
wcd937x_slave_dlkm.ko
mt2060.ko
q6_notifier_dlkm.ko
tuner-simple.ko
snd_event_dlkm.ko
mc44s803.ko
wcd_core_dlkm.ko
qm1d1b0004.ko
tda18250.ko
mbhc_dlkm.ko
tuner-types.ko
si2157.ko
mt2131.ko
slimbus.ko
native_dlkm.ko
va_macro_dlkm.ko
hid-aksys.ko
mt2266.ko
bolero_cdc_dlkm.ko
mxl5007t.ko
wcd938x_slave_dlkm.ko
q6_pdr_dlkm.ko
e4000.ko
it913x.ko
swr_ctrl_dlkm.ko
mxl301rf.ko
lvstest.ko
smp2p_sleepstate.ko
msm-geni-se.ko
msm_performance.ko
qrtr-haven.ko
pinctrl-spmi-gpio.ko
spi-msm-geni.ko
gpucc-lahaina.ko
swr_dlkm.ko
rdbg.ko
swr_dmic_dlkm.ko
r820t.ko
camera.ko
dwc3-qcom.ko
qcom_soc_wdt.ko
phy-qcom-ufs-qmp-v4.ko
pmic_glink.ko
aw882xx_k504.ko
usb_bam.ko
camcc-shima.ko
ipam.ko
ucsi_glink.ko
videocc-shima.ko
i2c-msm-geni.ko
cnss_utils.ko
incrementalfs.ko
xhci-pci.ko
platform_dlkm.ko
tx_macro_dlkm.ko
spmi-pmic-arb.ko
qrtr.ko
phy-qcom-ufs-qmp-v3-660.ko
msm_qmp.ko
xhci-plat-hcd.ko
swr_dmic_dlkm.ko
hh_rm_drv.ko
msm_glink_ssr.ko
altmode-glink.ko
qcom_ipcc.ko
wsa883x_dlkm.ko
snd-usb-audio-qmi.ko
socinfo.ko
qcom_hwspinlock.ko
leds-qti-flash.ko
device_management_service_v01.ko
msm-vidc.ko
qcom-hv-haptics.ko
qcom_proxy_of_consumer.ko
qcom_pm8008-regulator.ko
hh_mem_notifier.ko
phy-qcom-ufs-qmp-v3.ko
qcom-spmi-pmic.ko
phy-qcom-emu.ko
qcom-spmi-wled.ko
wlan_firmware_service_v01.ko
qpnp-lcdb-regulator.ko
service-notifier.ko
qpnp-pbs.ko
glink_pkt.ko
va_macro_dlkm.ko
sg.ko
adsp_loader_dlkm.ko
bt_fm_slim.ko
spss_utils.ko
cnss_prealloc.ko
stub_dlkm.ko
usb_f_cdev.ko
qcom-i2c-pmic.ko
regmap-spmi.ko
dispcc-lahaina.ko
qmi_helpers.ko
hwmon.ko
hh_virt_wdt.ko
qcom-vadc-common.ko
qcom-spmi-adc5.ko
qsee_ipc_irq.ko
msm_kgsl.ko
subsys-pil-tz.ko
u_audio.ko
qcom_glink_native.ko
subsystem_restart.ko
sysmon_subsystem_stats.ko
wcd938x_slave_dlkm.ko
microdump_collector.ko
camcc-lahaina.ko
ssusb-redriver-nb7vpq904m.ko
rndisipam.ko
msm_sharedmem.ko
qcom-dload-mode.ko
q6_pdr_dlkm.ko
qcom-spmi-sdam.ko
ipa_fmwk.ko
spmi-glink-debug.ko
q6_notifier_dlkm.ko
qcedev-mod.ko
dwc3-of-simple.ko
service-locator.ko
native_dlkm.ko
governor_msm_adreno_tz.ko
pinctrl-spmi-mpp.ko
pmic-pon-log.ko
wcd937x_dlkm.ko
videocc-lahaina.ko
btpower.ko
pinctrl_lpi_dlkm.ko
wcd937x_slave_dlkm.ko
mhi_uci.ko
hh_ctrl.ko
smp2p.ko
sensors_ssc.ko
qsee_ipc_irq_bridge.ko
slimbus-ngd.ko
bolero_cdc_dlkm.ko
qpnp-amoled-regulator.ko
glink_probe.ko
rx_macro_dlkm.ko
phy-msm-snps-hs.ko
nvmem_qfprom.ko
hh_dbl.ko
apr_dlkm.ko
usbtouchscreen.ko
extcon-usb-gpio.ko
rq_stats.ko
qseecom-mod.ko
smsm.ko
dwc3.ko
gpucc-yupik.ko
camera.ko
qti_battery_charger_main.ko
usb_f_uac2.ko
qcom-reboot-reason.ko
typec_ucsi.ko
xhci-hcd.ko
qcom_wdt_core.ko
cdsprm.ko
videocc-yupik.ko
phy-qcom-ufs-qmp-14nm.ko
frpc-adsprpc.ko
usb_f_diag.ko
gpucc-shima.ko
phy-msm-ssusb-qmp.ko
ns.ko
llcc-lahaina.ko
dwc3-msm.ko
cnss2.ko
usb_f_gsi.ko
qti_battery_debug.ko
qti_amoled_ecm.ko
gsim.ko
wsa_macro_dlkm.ko
cnss_nl.ko
wcd938x_dlkm.ko
eud.ko
spmi-pmic-arb-debug.ko
qrtr-smd.ko
dwc3-haps.ko
slimbus.ko
swr_ctrl_dlkm.ko
usb_f_ccid.ko
msm_ion_heaps.ko
usb_f_qdss.ko
smcinvoke.ko
mbhc_dlkm.ko
qcom_llcc.ko
core_hang_detect.ko
swr_haptics_dlkm.ko
dispcc-shima.ko
qfprom-sys.ko
qce50.ko
rdbg.ko
qcom-spmi-temp-alarm.ko
spcom.ko
hh_irq_lend.ko
synx-driver.ko
llcc-yupik.ko
qti-fixed-regulator.ko
pwm-qti-lpg.ko
hh_msgq.ko
msm_geni_serial.ko
snd_event_dlkm.ko
q6_dlkm.ko
epss-l3.ko
llcc-shima.ko
dispcc-yupik.ko
ipa_clientsm.ko
msm_rng.ko
icnss2.ko
clk-aop-qmp.ko
qrtr-mhi.ko
qcom-cpufreq-hw.ko
peripheral-loader.ko
mhi_bus.ko
cdsp-loader.ko
pinctrl_wcd_dlkm.ko
qcom_glink_spss.ko
msm_drm.ko
wcd_core_dlkm.ko
smem.ko
governor_gpubw_mon.ko
rtc-pm8xxx.ko
msm-cvp.ko
pci-msm-drv.ko
qcom_glink_smem.ko
machine_dlkm.ko
sps_drv.ko
hvc_haven.ko
camcc-yupik.ko
gpi.ko
ehset.ko
qca_cld3_wlan.ko
qca_cld3_qca6750.ko
qca_cld3_qca6390.ko
@ -95,17 +227,15 @@ bm_adsp_ulog.ko
mmi_charger.ko
qti_glink_charger.ko
qpnp_adaptive_charge.ko
cirrus_wm_adsp.ko
cirrus_cs35l41.ko
aw8695.ko
mmi_info.ko
mmi_relay.ko
goodix_fod_mmi.ko
ets_fps_mmi.ko
wl2864c.ko
cci_intf.ko
st21nfc.ko
sx937x_sar.ko
moto_f_usbnet.ko
touchscreen_mmi.ko
stmicro_mmi.ko
nova_0flash_mmi.ko
mmi_sys_temp.ko

View file

@ -1,7 +1,8 @@
camera.ko
msm_drm.ko
mmi_relay.ko
sensors_class.ko
touchscreen_mmi.ko
mmi_annotate.ko
mmi_info.ko
stmicro_mmi.ko
mmi_annotate.ko
sensors_class.ko
mmi_relay.ko
touchscreen_mmi.ko
nova_0flash_mmi.ko

View file

@ -1,5 +1,5 @@
runtime_resource_overlay {
name: "FrameworksResBerlin",
name: "FrameworksResBerlna",
sdk_version: "current",
vendor: true
}

View file

@ -4,6 +4,6 @@
SPDX-License-Identifier: Apache-2.0
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.overlay.berlin">
package="android.overlay.berlna">
<overlay android:targetPackage="android" android:isStatic="true" android:priority="600"/>
</manifest>

View file

@ -268,10 +268,10 @@
</array>
<array name="config_sfps_sensor_props_0" translatable="false">
<item>local:4630947043778501762</item> <!--item>displayId</item-->
<item>local:4630946747577212034</item> <!--item>displayId</item-->
<item>1080</item> <!--item>sensorLocationX</item-->
<item>705</item> <!--item>sensorLocationY</item-->
<item>150</item> <!--item>sensorRadius</item-->
<item>800</item> <!--item>sensorLocationY</item-->
<item>50</item> <!--item>sensorRadius</item-->
</array>
<!-- Indicates whether device has a power button fingerprint sensor. -->
@ -294,7 +294,7 @@
<integer name="config_defaultPeakRefreshRate">60</integer>
<!-- MMS user agent string -->
<string name="config_mms_user_agent" translatable="false">motorolaedge20pro</string>
<string name="config_mms_user_agent" translatable="false">motorolaedge</string>
<!-- MMS user agent profile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motov1/Profile/motov1.rdf</string>

View file

@ -5,11 +5,11 @@
-->
<resources>
<!-- Radius of the software rounded corners. -->
<dimen name="rounded_corner_radius">70px</dimen>
<dimen name="rounded_corner_radius">72px</dimen>
<!-- Height of the status bar in portrait. The height should be
Max((status bar content height + waterfall top size), top cutout size) -->
<dimen name="status_bar_height">90px</dimen>
<dimen name="status_bar_height">115px</dimen>
<dimen name="status_bar_padding_top_portrait">10.0px</dimen>
<dimen name="status_bar_padding_top_portrait">19.0px</dimen>
</resources>

View file

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<device name="Android">
<item name="none">0</item>
<item name="screen.on">139.28</item>
<item name="screen.full">155.5</item>
<item name="wifi.on">0.9</item>
<item name="screen.on">79.683</item>
<item name="screen.full">393.32</item>
<item name="wifi.on">1.293</item>
<item name="wifi.active">34.36</item>
<item name="wifi.scan">4.73</item>
<item name="camera.avg">523.93</item>
<item name="camera.flashlight">200.75</item>
<item name="gps.on">171</item>
<item name="radio.active">86.278</item>
<item name="radio.scanning">10.57</item>
<item name="radio.scanning">33.2</item>
<array name="radio.on">
<value>33.079</value>
<value>30</value>
@ -100,7 +100,7 @@
<item name="cpu.cluster_power.cluster1">1.13</item>
<item name="cpu.cluster_power.cluster1">1.13</item>
<item name="cpu.suspend">5.5</item>
<item name="cpu.idle">15.86</item>
<item name="cpu.active">5.79</item>
<item name="battery.capacity">4000</item>
</device>
<item name="cpu.idle">22.71</item>
<item name="cpu.active">6.9</item>
<item name="battery.capacity">5000</item>
</device>

View file

@ -4,6 +4,6 @@
//
runtime_resource_overlay {
name: "LineageSystemUIBerlin",
name: "LineageSystemUIBerlna",
vendor: true,
}

View file

@ -4,7 +4,7 @@
SPDX-License-Identifier: Apache-2.0
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.systemui.berlin.lineage">
package="com.android.systemui.berlna.lineage">
<overlay
android:isStatic="true"

View file

@ -16,7 +16,7 @@
64 - Volume rocker
For example, a device with Home, Back and Menu keys would set this
config to 7. -->
<integer name="config_deviceHardwareKeys">72</integer>
<integer name="config_deviceHardwareKeys">64</integer>
<!-- Hardware keys present on the device with the ability to wake, stored as a bit field.
This integer should equal the sum of the corresponding value for each
@ -30,5 +30,5 @@
64 - Volume rocker
For example, a device with Home, Back and Menu keys would set this
config to 7. -->
<integer name="config_deviceHardwareWakeKeys">72</integer>
<integer name="config_deviceHardwareWakeKeys">64</integer>
</resources>

View file

@ -1,5 +1,5 @@
runtime_resource_overlay {
name: "SystemUIResBerlin",
name: "SystemUIResBerlna",
sdk_version: "current",
vendor: true
}

View file

@ -5,6 +5,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
coreApp="true"
package="com.android.systemui.overlay.berlin">
package="com.android.systemui.overlay.berlna">
<overlay android:targetPackage="com.android.systemui" android:isStatic="true" />
</manifest>

View file

@ -8,7 +8,7 @@
set -e
export DEVICE=berlin
export DEVICE=berlna
export DEVICE_COMMON=sm7325-common
export VENDOR=motorola

View file

@ -1,3 +1,3 @@
# Google
ro.opa.device_model_id=motorola-berlin
ro.opa.device_model_id=motorola-berlna
ro.opa.eligible_device=true

View file

@ -14,9 +14,9 @@
// limitations under the License.
cc_binary {
name: "vendor.lineage.touch@1.0-service.berlin",
vintf_fragments: ["vendor.lineage.touch@1.0-service.berlin.xml"],
init_rc: ["vendor.lineage.touch@1.0-service.berlin.rc"],
name: "vendor.lineage.touch@1.0-service.berlna",
vintf_fragments: ["vendor.lineage.touch@1.0-service.berlna.xml"],
init_rc: ["vendor.lineage.touch@1.0-service.berlna.rc"],
defaults: ["hidl_defaults"],
relative_install_path: "hw",
proprietary: true,

View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "lineage.touch@1.0-service.berlin"
#define LOG_TAG "lineage.touch@1.0-service.berlna"
#include <android-base/logging.h>
#include <hidl/HidlTransportSupport.h>

View file

@ -1,4 +1,4 @@
service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.berlin
service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.berlna
interface vendor.lineage.touch@1.0::IHighTouchPollingRate default
class hal
user system