Merge "vendor: Poor Man Themes: add From Hell Theme" into android-8.1
diff --git a/build/core/qcom_target.mk b/build/core/qcom_target.mk
index d0bd6bb..2396c5e 100644
--- a/build/core/qcom_target.mk
+++ b/build/core/qcom_target.mk
@@ -21,7 +21,7 @@
 #    2ND_CLANG_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)
 
     TARGET_COMPILE_WITH_MSM_KERNEL := true
-    MSM_VIDC_TARGET_LIST := msm8974 msm8610 msm8226 apq8084 msm8916 msm8937 msm8952 msm8953 msm8994 msm8909 msm8992 msm8996 msm8998
+    MSM_VIDC_TARGET_LIST := msm8974 msm8610 msm8226 apq8084 msm8916 msm8937 msm8952 msm8953 msm8994 msm8909 msm8992 msm8996 msm8998 sdm660 sdm845
 endif
 
 
diff --git a/build/core/qcom_utils.mk b/build/core/qcom_utils.mk
index fdd0d31..b64cef9 100755
--- a/build/core/qcom_utils.mk
+++ b/build/core/qcom_utils.mk
@@ -20,6 +20,8 @@
 QCOM_BOARD_PLATFORMS += msm8996
 QCOM_BOARD_PLATFORMS += msm8998
 QCOM_BOARD_PLATFORMS += apq8084
+QCOM_BOARD_PLATFORMS += sdm660
+QCOM_BOARD_PLATFORMS += sdm845
 
 MSM7K_BOARD_PLATFORMS := msm7630_surf
 MSM7K_BOARD_PLATFORMS += msm7630_fusion
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
index 5198b04..f3dfcf6 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -24,4 +24,7 @@
     <!-- Should "4G" be shown instead of "LTE" when the network is NETWORK_TYPE_LTE? -->
     <bool name="config_show4GForLTE">false</bool>
 
+    <!-- Control whether status bar should distinguish HSPA data icon form UMTS
+    data icon on devices -->
+    <bool name="config_hspa_data_distinguishable">true</bool>
 </resources>