diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 4b1bfdc4..d647d6f7 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -15,6 +15,8 @@
*/
apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
dependencies {
implementation "com.squareup.wire:wire-runtime:1.6.1"
@@ -55,8 +57,6 @@ android {
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
- multiDexEnabled true
-
ndk {
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
}
@@ -70,6 +70,7 @@ android {
sourceSets {
main {
java.srcDirs += 'src/main/protos-java'
+ java.srcDirs += 'src/main/kotlin'
}
}
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PreferenceSwitchBar.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PreferenceSwitchBarCallback.kt
similarity index 100%
rename from play-services-core/src/main/kotlin/org/microg/gms/ui/PreferenceSwitchBar.kt
rename to play-services-core/src/main/kotlin/org/microg/gms/ui/PreferenceSwitchBarCallback.kt
diff --git a/play-services-core/src/main/res/layout/device_registration_fragment.xml b/play-services-core/src/main/res/layout/device_registration_fragment.xml
new file mode 100755
index 00000000..0f0648dc
--- /dev/null
+++ b/play-services-core/src/main/res/layout/device_registration_fragment.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/play-services-core/src/main/res/layout/preference_switch_bar.xml b/play-services-core/src/main/res/layout/preference_switch_bar.xml
new file mode 100755
index 00000000..08ad6530
--- /dev/null
+++ b/play-services-core/src/main/res/layout/preference_switch_bar.xml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/play-services-core/src/main/res/layout/push_notification_app_fragment.xml b/play-services-core/src/main/res/layout/push_notification_app_fragment.xml
new file mode 100755
index 00000000..4f63f961
--- /dev/null
+++ b/play-services-core/src/main/res/layout/push_notification_app_fragment.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/play-services-core/src/main/res/layout/push_notification_fragment.xml b/play-services-core/src/main/res/layout/push_notification_fragment.xml
new file mode 100755
index 00000000..e9611b83
--- /dev/null
+++ b/play-services-core/src/main/res/layout/push_notification_fragment.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+