diff --git a/Android.mk b/Android.mk
index 303a7d8..5e7b3d8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,6 @@
LOCAL_PATH := $(call my-dir)
-ifneq ($(filter beyond2lte, $(TARGET_DEVICE)),)
+ifneq ($(filter d1, $(TARGET_DEVICE)),)
include $(call all-subdir-makefiles,$(LOCAL_PATH))
endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 67cc631..58dae1f 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,9 +15,9 @@
#
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/lineage_beyond2lte.mk
+ $(LOCAL_DIR)/lineage_d1.mk
COMMON_LUNCH_CHOICES := \
- lineage_beyond2lte-eng \
- lineage_beyond2lte-user \
- lineage_beyond2lte-userdebug
+ lineage_d1-eng \
+ lineage_d1-user \
+ lineage_d1-userdebug
diff --git a/BoardConfig.mk b/BoardConfig.mk
index d930ee7..9ab3c0f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -17,9 +17,9 @@
include device/samsung/exynos9820-common/BoardConfigCommon.mk
## Inherit from the proprietary configuration
-include vendor/samsung/beyond2lte/BoardConfigVendor.mk
+include vendor/samsung/d1/BoardConfigVendor.mk
-DEVICE_PATH := device/samsung/beyond2lte
+DEVICE_PATH := device/samsung/d1
## APEX image
DEXPREOPT_GENERATE_APEX_IMAGE := true
@@ -30,7 +30,7 @@ TARGET_SPECIFIC_HEADER_PATH += $(DEVICE_PATH)/include
TARGET_SCREEN_DENSITY := 420
## Kernel
-TARGET_KERNEL_CONFIG := exynos9820-beyond2lte_defconfig
+TARGET_KERNEL_CONFIG := exynos9820-d1_defconfig
## Properties
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
diff --git a/device.mk b/device.mk
index 663dae6..23e476a 100644
--- a/device.mk
+++ b/device.mk
@@ -18,7 +18,7 @@
$(call inherit-product, device/samsung/exynos9820-common/common.mk)
# Inherit proprietary files
-$(call inherit-product, vendor/samsung/beyond2lte/beyond2lte-vendor.mk)
+$(call inherit-product, vendor/samsung/d1/d1-vendor.mk)
# Setup dalvik vm configs
$(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
diff --git a/extract-files.sh b/extract-files.sh
index d096f5e..d33db03 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -14,7 +14,7 @@ fi
set -e
-export DEVICE=beyond2lte
+export DEVICE=d1
export DEVICE_COMMON=exynos9820-common
export VENDOR=samsung
diff --git a/lineage_beyond2lte.mk b/lineage_d1.mk
similarity index 84%
rename from lineage_beyond2lte.mk
rename to lineage_d1.mk
index 6638d59..659323f 100644
--- a/lineage_beyond2lte.mk
+++ b/lineage_d1.mk
@@ -24,13 +24,13 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk)
## Inscreen Fingerprint HAL
TARGET_HAVE_FOD := true
-## Inherit from beyond2lte device
-$(call inherit-product, device/samsung/beyond2lte/device.mk)
+## Inherit from d1 device
+$(call inherit-product, device/samsung/d1/device.mk)
## Boot Animation
TARGET_BOOTANIMATION_HALF_RES := true
-TARGET_SCREEN_HEIGHT := 3040
-TARGET_SCREEN_WIDTH := 1440
+TARGET_SCREEN_HEIGHT := 2280
+TARGET_SCREEN_WIDTH := 1080
## Inherit some common Lineage stuff
$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
@@ -39,10 +39,10 @@ $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
## Device identifier, this must come after all inclusions
-PRODUCT_NAME := lineage_beyond2lte
-PRODUCT_DEVICE := beyond2lte
+PRODUCT_NAME := lineage_d1
+PRODUCT_DEVICE := d1
PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SM-G975F
+PRODUCT_MODEL := SM-N970F
PRODUCT_MANUFACTURER := samsung
PRODUCT_GMS_CLIENTID_BASE := android-samsung
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 2ea24b2..68229d5 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -41,5 +41,5 @@
@see https://www.w3.org/TR/SVG/paths.html#PathData
-->
- M 0,0 H -326 V 142 H 0 V 0 Z @right
+ M 0,0 H -36 V 90 H 36 V 0 H 0 Z
diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml
index c6074a4..012ed70 100644
--- a/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -19,5 +19,5 @@
-->
- 7mm
+ 5.6879883mm
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 91ac449..d379da7 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -1,19 +1,19 @@
- 0
- - 21
- - 72
- - 339
- - 35
- - 176
- - 107
- - 417
- - 31
- - 171
- - 114
+ - 21.8
+ - 58
+ - 293.5
+ - 74
+ - 195
+ - 150
+ - 243
+ - 53
+ - 169
+ - 109
- 7.7
- 7.7
+ 10
+ 10
- 0
- 0
@@ -40,21 +40,22 @@
442000
- 109
- 99
- 90
- 71
- 62
- 57
- 49
- 46
+ 111
+ 102
+ 91
+ 77
+ 69
+ 63
+ 58
+ 54
+ 51
+ 48
+ 45
43
- 39
- 35
- 34
- 32
+ 42
+ 2400000
2314000
2210000
2106000
@@ -74,23 +75,24 @@
507000
- 382
- 285
- 250
- 223
- 199
- 178
- 156
+ 415
+ 367
+ 283
+ 241
+ 216
+ 196
+ 176
+ 155
139
- 130
- 117
- 100
- 86
+ 129
+ 119
+ 104
+ 91
+ 84
77
- 70
- 64
- 57
- 51
+ 72
+ 66
+ 59
2730000
@@ -116,32 +118,32 @@
520000
- 1301
- 1208
- 1028
- 837
- 679
- 610
- 485
- 425
- 353
- 307
- 270
- 241
- 224
- 193
- 178
- 153
- 133
- 115
- 105
- 94
- 83
+ 1067
+ 1001
+ 835
+ 752
+ 621
+ 561
+ 443
+ 387
+ 328
+ 288
+ 254
+ 229
+ 213
+ 189
+ 174
+ 155
+ 132
+ 118
+ 112
+ 101
+ 92
- - 4.99
- - 20
- - 4000
- - 4100
+ - 7.2
+ - 27
+ - 3400
+ - 3500
- 1
- 65
- 265
@@ -160,15 +162,15 @@
- 10
- 10
- 78
- 105
- 128
- 160
- 230
- 266
- 389
- 458
- 516
+ 73
+ 95
+ 115
+ 138
+ 205
+ 235
+ 333
+ 408
+ 515
156000
@@ -179,40 +181,6 @@
433000
572000
650000
- 702000
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
+ 754000
\ No newline at end of file
diff --git a/proprietary-files.txt b/proprietary-files.txt
index bb178f3..86458b0 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# Proprietary files - from Samsung package version G975FXXSBFUE6, unless pinned
+# Proprietary files - from Samsung package version N970FXXS7FUEB, unless pinned
## Audio
vendor/etc/floating_feature.xml
@@ -14,15 +14,13 @@ vendor/firmware/AP_AUDIO_SLSI.bin
vendor/firmware/SoundBoosterParam.bin
## Bluetooth Firmware
-vendor/firmware/bcm4375B0_murata.hcd
-vendor/firmware/bcm4375B0_semco.hcd
vendor/firmware/bcm4375B1_murata.hcd
vendor/firmware/bcm4375B1_semco.hcd
vendor/firmware/bcm4375B1_semco_sem.hcd
## Camera
-vendor/lib/hw/camera.exynos9820.so
-vendor/lib64/hw/camera.exynos9820.so
+vendor/lib/hw/camera.exynos9825.so:vendor/lib/hw/camera.exynos9820.so
+vendor/lib64/hw/camera.exynos9825.so:vendor/lib64/hw/camera.exynos9820.so
## Camera dependencies
vendor/lib/libexynoscamera3.so
@@ -41,7 +39,7 @@ vendor/firmware/cs35l40-rcv-dsp1-spk-prot-calib.bin
vendor/firmware/cs35l40-rcv-dsp1-spk-prot.bin
vendor/firmware/fimc_is_fw_mcu.bin
vendor/firmware/setfile_2l4.bin
-vendor/firmware/setfile_3m3.bin
+vendor/firmware/setfile_3m5.bin
vendor/firmware/setfile_3p9.bin
## GPS
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index d096f5e..d33db03 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -14,7 +14,7 @@ fi
set -e
-export DEVICE=beyond2lte
+export DEVICE=d1
export DEVICE_COMMON=exynos9820-common
export VENDOR=samsung