AdvancedDisplay: Re-integrate into Settings
* Apply the default Oreo theme and inherit the layouts from Google
for the Settings app, in order to keep UI consistency.
* Get rid of SettingsDrawerActivity as it no longer fits in.
* Add required appcompat and preference support libraries.
* Integrate into display settings category using IA.
Change-Id: I8438e0ebec27085df2be4668f8f7170d2010fb20
diff --git a/AdvancedDisplay/Android.mk b/AdvancedDisplay/Android.mk
index d972dc4..e0d82fa 100644
--- a/AdvancedDisplay/Android.mk
+++ b/AdvancedDisplay/Android.mk
@@ -9,16 +9,19 @@
LOCAL_CERTIFICATE := platform
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-v14-preference \
+ android-support-v4 \
android-support-v7-appcompat \
android-support-v7-preference \
android-support-v7-recyclerview \
+ android-support-v13 \
+ android-support-v14-preference \
org.lineageos.platform.internal
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/res \
+ $(TOP)/packages/resources/devicesettings/res \
frameworks/support/v14/preference/res \
frameworks/support/v7/appcompat/res \
frameworks/support/v7/preference/res \
@@ -31,8 +34,6 @@
--extra-packages android.support.v7.preference \
--extra-packages android.support.v7.recyclerview
-include frameworks/base/packages/SettingsLib/common.mk
-
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))