shamu: AICPfy

15 files changed, 61 insertions, 240 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 77cf6b15..8f8eff84 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,5 +15,5 @@
 #
 
 PRODUCT_MAKEFILES += \
-    $(LOCAL_DIR)/lineage_shamu.mk
+    $(LOCAL_DIR)/aicp_shamu.mk
 
diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 00000000..bcfbe8a3
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,17 @@
+[
+  {
+    "repository": "AICP/kernel_moto_shamu",
+    "target_path": "kernel/moto/shamu",
+    "branch": "p9.0"
+  },
+  {
+    "repository": "AICP/proprietary_vendor_motorola",
+    "target_path": "vendor/motorola",
+    "branch": "p9.0"
+  },
+  {
+    "repository": "LineageOS/android_hardware_broadcom_nfc",
+    "target_path": "hardware/broadcom/nfc",
+    "branch": "lineage-16.0"
+  }
+]
diff --git a/lineage_shamu.mk b/aicp_shamu.mk
index 04011b01..1f7f5d83 100644
--- a/lineage_shamu.mk
+++ b/aicp_shamu.mk
@@ -18,8 +18,8 @@ TARGET_SCREEN_HEIGHT := 2560
 TARGET_SCREEN_WIDTH := 1440
 TARGET_BOOTANIMATION_HALF_RES := true
 
-# Inherit some common LineageOS 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 the common Open Source product configuration
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
@@ -31,7 +31,7 @@ $(call inherit-product, $(LOCAL_PATH)/device.mk)
 $(call inherit-product, vendor/motorola/shamu/shamu-vendor.mk)
 
 # Device identifier. This must come after all inclusions
-PRODUCT_NAME := lineage_shamu
+PRODUCT_NAME := aicp_shamu
 PRODUCT_DEVICE := shamu
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Nexus 6
diff --git a/device.mk b/device.mk
index 85c88521..90a1230e 100644
--- a/device.mk
+++ b/device.mk
@@ -153,8 +153,7 @@ PRODUCT_PACKAGES += \
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS := \
-    $(LOCAL_PATH)/overlay \
-    $(LOCAL_PATH)/overlay-lineage
+    $(LOCAL_PATH)/overlay
 
 # Permissions
 PRODUCT_COPY_FILES += \
diff --git a/extract-files.sh b/extract-files.sh
index 486de336..5e7914ca 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -25,9 +25,9 @@ DEVICE=shamu
 MY_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
-LINEAGE_ROOT="$MY_DIR"/../../..
+AICP_ROOT="$MY_DIR"/../../..
 
-HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
+HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
@@ -57,7 +57,7 @@ if [ -z "$SRC" ]; then
 fi
 
 # Initialize the helper
-setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false "$CLEAN_VENDOR"
+setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT" false "$CLEAN_VENDOR"
 
 extract "$MY_DIR"/device-proprietary-files.txt "$SRC" "$SECTION"
 
diff --git a/hidl.mk b/hidl.mk
index 6e4386ea..5381266e 100644
--- a/hidl.mk
+++ b/hidl.mk
@@ -91,10 +91,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.thermal@1.1-service.shamu
 
-# Trust
-PRODUCT_PACKAGES += \
-    vendor.lineage.trust@1.0-service
-
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.0-service.basic
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index 7aab1e4d..00000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "repository": "android_kernel_moto_shamu",
-    "target_path": "kernel/moto/shamu"
-  }
-]
diff --git a/manifest.xml b/manifest.xml
index e82b2ab8..2dbb9c4e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -266,22 +266,4 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.lineage.power</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ILineagePower</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.lineage.trust</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IUsbRestrict</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 </manifest>
diff --git a/overlay-lineage/frameworks/base/core/res/res/values/config.xml b/overlay-lineage/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 139d009c..00000000
--- a/overlay-lineage/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-** Copyright (C) 2019 The LineageOS 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-
-    <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
-    <bool name="config_intrusiveNotificationLed">true</bool>
-
-    <!-- Default color for notification LED is green. -->
-    <color name="config_defaultNotificationColor">#ff00ff00</color>
-
-    <!-- Default value for led color when battery is medium charged
-         We set this to blue as low is red and charged is green -->
-    <integer name="config_notificationsBatteryMediumARGB">0xFF0000FF</integer>
-
-    <!-- Whether device supports double tap to wake -->
-    <bool name="config_supportDoubleTapWake">true</bool>
-</resources>
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 4336fd22..00000000
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS 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:
-
-         // Device has a color adjustable battery light.
-         LIGHTS_RGB_NOTIFICATION_LED = 1
-
-         // Device has a color adjustable notification light.
-         LIGHTS_RGB_BATTERY_LED = 2
-
-         LIGHTS_MULTIPLE_NOTIFICATION_LED = 4 (deprecated)
-
-         // The notification light has adjustable pulsing capability.
-         LIGHTS_PULSATING_LED = 8
-
-         // Device has a multi-segment battery light that is able to
-         // use the light brightness value to determine how many
-         // segments to show (in order to represent battery level).
-         LIGHTS_SEGMENTED_BATTERY_LED = 16
-
-         // The notification light supports HAL adjustable brightness
-         // via the alpha channel.
-         // Note: if a device notification light supports LIGHTS_RGB_NOTIFICATION_LED
-         // then HAL support is not necessary for brightness control.  In this case,
-         // brightness support will be provided by lineage-sdk through the scaling of
-         // RGB color values.
-         LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS = 32
-
-         // Device has a battery light.
-         LIGHTS_BATTERY_LED = 64
-
-         // The battery light supports HAL adjustable brightness via
-         // the alpha channel.
-         // Note: if a device battery light supports LIGHTS_RGB_BATTERY_LED then HAL
-         // support is not necessary for brightness control.  In this case,
-         // brightness support will be provided by lineage-sdk through the scaling of
-         // RGB color values.
-         LIGHTS_ADJUSTABLE_BATTERY_LED_BRIGHTNESS = 128
-
-         For example, a device with notification and battery lights that supports
-         pulsating and RGB control would set this config to 75. -->
-    <integer name="config_deviceLightCapabilities">195</integer>
-
-    <!-- Default values for display color temperature -->
-    <integer name="config_nightColorTemperature">5200</integer>
-
-    <!-- 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>
-
-    <!-- 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
-         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_deviceHardwareWakeKeys">64</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>
-    <integer name="config_proximityCheckTimeout">250</integer>
-    <bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool>
-
-    <!-- Indicate whether encryption causes significant performances loss.
-         This MUST NOT be set to true on devices produced in 2016 or later -->
-    <bool name="config_trustLegacyEncryption">true</bool>
-
-    <!-- Whether device needs to wait for Qualcomm MPCTL service to start
-         before setting power profiles on boot. -->
-    <bool name="config_waitForMpctlOnBoot">true</bool>
-</resources>
diff --git a/overlay-lineage/packages/apps/Snap/res/values/config.xml b/overlay-lineage/packages/apps/Snap/res/values/config.xml
deleted file mode 100644
index df8d0d7f..00000000
--- a/overlay-lineage/packages/apps/Snap/res/values/config.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-                   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.
--->
-
-<!-- Camera app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Restart preview for back camera onPictureTaken -->
-    <bool name="back_camera_restart_preview_onPictureTaken">true</bool>
-
-    <!-- Restart preview for front camera onPictureTaken -->
-    <bool name="front_camera_restart_preview_onPictureTaken">true</bool>
-
-    <!-- Opens back camera using openLegacy() -->
-    <bool name="back_camera_open_legacy">false</bool>
-
-    <!-- Opens front camera using openLegacy() -->
-    <bool name="front_camera_open_legacy">false</bool>
-
-    <!-- Enable support for camera api v2 -->
-    <bool name="support_camera_api_v2">true</bool>
-
-</resources>
diff --git a/overlay-lineage/packages/services/Telephony/res/values/strings.xml b/overlay-lineage/packages/services/Telephony/res/values/strings.xml
deleted file mode 100644
index 0d9b63ac..00000000
--- a/overlay-lineage/packages/services/Telephony/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="enabled_networks_values" translatable="false">
-        <item>"10"</item>
-        <item>"0"</item>
-        <item>"1"</item>
-    </string-array>
-</resources>
-
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index e3ef5dcb..8e6e8ae9 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -343,4 +343,17 @@
 
     <!-- If true, the display will be shifted around in ambient mode. -->
     <bool name="config_enableBurnInProtection">true</bool>
+
+    <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->	
+    <bool name="config_intrusiveNotificationLed">true</bool>	
+
+     <!-- Default color for notification LED is green. -->	
+    <color name="config_defaultNotificationColor">#ff00ff00</color>	
+
+     <!-- Default value for led color when battery is medium charged	
+         We set this to blue as low is red and charged is green -->	
+    <integer name="config_notificationsBatteryMediumARGB">0xFF0000FF</integer>	
+
+     <!-- Whether device supports double tap to wake -->	
+    <bool name="config_supportDoubleTapWake">true</bool>
 </resources>
diff --git a/overlay/packages/services/Telephony/res/values/strings.xml b/overlay/packages/services/Telephony/res/values/strings.xml
new file mode 100644
index 00000000..305a5e9a
--- /dev/null
+++ b/overlay/packages/services/Telephony/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>	
+<!-- Copyright (C) 2015 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">	
+    <string-array name="enabled_networks_values" translatable="false">	
+        <item>"10"</item>	
+        <item>"0"</item>	
+        <item>"1"</item>	
+    </string-array>	
+</resources>
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 4f1ddcf3..02a3c434 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -27,9 +27,9 @@ INITIAL_COPYRIGHT_YEAR=2014
 MY_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
-LINEAGE_ROOT="$MY_DIR"/../../..
+AICP_ROOT="$MY_DIR"/../../..
 
-HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
+HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
@@ -37,7 +37,7 @@ fi
 . "$HELPER"
 
 # Initialize the helper
-setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
+setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT"
 
 # Copyright headers and guards
 write_headers