zenfone6: DeviceParts: convert to blueprint
Change-Id: I01e8fad7b55d0fcf266db7ee84d14f9842aedaab
diff --git a/DeviceParts/Android.bp b/DeviceParts/Android.bp
new file mode 100644
index 0000000..a82699f
--- /dev/null
+++ b/DeviceParts/Android.bp
@@ -0,0 +1,30 @@
+android_app {
+ name: "DeviceParts",
+
+ defaults: [
+ "SettingsLibDefaults",
+ ],
+
+ static_libs: [
+ "androidx.core_core",
+ "androidx.preference_preference",
+ "OmniLib",
+ ],
+
+ srcs: [
+ "src/**/*.java",
+ ],
+ certificate: "platform",
+ privileged: true,
+ platform_apis: true,
+ resource_dirs: ["res"],
+
+ libs: ["telephony-common"],
+
+ optimize: {
+ enabled: false,
+ },
+ dex_preopt: {
+ enabled: false,
+ },
+}
diff --git a/DeviceParts/Android.mk b/DeviceParts/Android.mk
deleted file mode 100644
index 0d57d5f..0000000
--- a/DeviceParts/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),zenfone6))
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- androidx.core_core \
- androidx.preference_preference
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := DeviceParts
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_USE_AAPT2 := true
-
-package_resource_overlays := $(strip \
- $(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \
- $(addprefix $(dir)/, packages/apps/DeviceParts/res))) \
- $(wildcard $(foreach dir, $(DEVICE_PACKAGE_OVERLAYS), \
- $(addprefix $(dir)/, packages/apps/DeviceParts/res))))
-
-LOCAL_RESOURCE_DIR := $(package_resource_overlays) $(LOCAL_RESOURCE_DIR)
-
-LOCAL_JAVA_LIBRARIES := telephony-common
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_DEX_PREOPT := false
-
-include frameworks/base/packages/SettingsLib/common.mk
-
-include packages/apps/OmniLib/common.mk
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/DeviceParts/AndroidManifest.xml b/DeviceParts/AndroidManifest.xml
index 20c4124..fced17a 100644
--- a/DeviceParts/AndroidManifest.xml
+++ b/DeviceParts/AndroidManifest.xml
@@ -17,7 +17,7 @@
<application
android:icon="@drawable/ic_launcher"
android:label="@string/advanced_settings"
- android:theme="@style/AppTheme"
+ android:theme="@style/Theme.AppTheme"
android:appComponentFactory="androidx.core.app.CoreComponentFactory"
tools:replace="android:appComponentFactory"
android:supportsRtl="true" >
diff --git a/DeviceParts/res/values/styles.xml b/DeviceParts/res/values/styles.xml
index ae909bd..7141b2e 100644
--- a/DeviceParts/res/values/styles.xml
+++ b/DeviceParts/res/values/styles.xml
@@ -14,10 +14,10 @@
limitations under the License.
-->
<resources>
- <style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Settings">
- <item name="preferenceTheme">@style/PreferenceTheme</item>
+ <style name="Theme.AppTheme" parent="@android:style/Theme.DeviceDefault.Settings">
+ <item name="preferenceTheme">@style/Theme.AppTheme.PreferenceTheme</item>
</style>
- <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
+ <style name="Theme.AppTheme.PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
</style>
</resources>