Use microg-ui-tools

microg · Jan 20, 2016 · 459b372 · 459b372
1 parent a775593
commit 459b372
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 544 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "extern/UnifiedNlpApi"]
 	path = extern/UnifiedNlpApi
 	url = https://github.com/microg/android_external_UnifiedNlpApi.git
+[submodule "extern/MicroGUiTools"]
+	path = extern/MicroGUiTools
+	url = https://github.com/microg/android_external_MicroGUiTools.git
diff --git a/extern/MicroGUiTools b/extern/MicroGUiTools
diff --git a/microg-ui-tools b/microg-ui-tools
@@ -0,0 +1 @@
+extern/MicroGUiTools/microg-ui-tools/
diff --git a/settings.gradle b/settings.gradle
@@ -2,3 +2,5 @@ include ':unifiednlp-compat'
 include ':unifiednlp-api'
 include ':unifiednlp-base'
 include ':unifiednlp-app'
+
+include ':microg-ui-tools'
diff --git a/unifiednlp-app/build.gradle b/unifiednlp-app/build.gradle
@@ -19,16 +19,29 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 
 apply plugin: 'com.android.application'
 
+String getMyVersionName() {
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'describe', '--tags', '--always', '--dirty'
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.2"
 
+    defaultConfig {
+        versionName getMyVersionName()
+    }
+
     productFlavors {
         NetworkLocation {
             applicationId = 'com.google.android.gms'

diff --git a/unifiednlp-base/build.gradle b/unifiednlp-base/build.gradle
@@ -19,23 +19,36 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 
 apply plugin: 'com.android.library'
 
+String getMyVersionName() {
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'describe', '--tags', '--always', '--dirty'
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.2"
+
+    defaultConfig {
+        versionName getMyVersionName()
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_6
     }
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:23.0.1'
-    compile 'com.android.support:appcompat-v7:23.0.1'
+    compile project(":microg-ui-tools")
     compile project(':unifiednlp-api')
     provided project(':unifiednlp-compat')
 }
diff --git a/unifiednlp-base/src/main/java/android/support/v4/preference/PreferenceFragment.java b/unifiednlp-base/src/main/java/android/support/v4/preference/PreferenceFragment.java