Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1b757de authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Various fixes, Checkin (dependency for GCM) is still broken! 

Fix lint (fixes #20)
(hopefully) Fix mcs loop (could cause high battery drain)
Show link to UnifiedNlp in settings (mentioned in #10, @XDA)
Add extended description for settings (mentioned @XDA)
parent d48defe2

GmsApi @ 2c847ce6

Compare ef5e6dc0 to 2c847ce6
Original line number Diff line number Diff line 
Subproject commit ef5e6dc0668a8ca152aa38a78f0e91d65120d3b6
 
Subproject commit 2c847ce6e8ac1604356dc45fd672cfdd6ad4d73b

UnifiedNlp @ 74fb8b69

Compare 06341df3 to 74fb8b69
Original line number Diff line number Diff line 
Subproject commit 06341df3469b581e2bf5ab46e09cc1bb75a5d811
 
Subproject commit 74fb8b696aaf35584b97c86eb7d9e67aaaf0e685

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip

play-services-core/build.gradle

+9 −5
Original line number Diff line number Diff line
@@ -16,25 +16,25 @@ 


buildscript {

    repositories {

        mavenCentral()

        jcenter()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:1.1.0'

        classpath 'com.android.tools.build:gradle:1.2.3'

    }

}



apply plugin: 'com.android.application'



repositories {

    mavenCentral()

    jcenter()

    flatDir {

        dirs '../libs'

    }

}



dependencies {

    compile 'com.android.support:support-v4:22.0.0'

    compile 'com.android.support:appcompat-v7:22.0.0'

    compile 'com.android.support:support-v4:22.2.0'

    compile 'com.android.support:appcompat-v7:22.2.0'

    compile 'de.hdodenhof:circleimageview:1.2.1'

    compile 'com.squareup.wire:wire-runtime:1.6.1'

    compile project(':play-services-api')
@@ -64,6 +64,10 @@ android { 
    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_6

    }

    lintOptions {

        // TODO: Remove MissingTranslation once we have stable strings and proper translations.

        disable 'MissingTranslation', 'InvalidPackage'

    }

}



if (file('user.gradle').exists()) {

play-services-core/src/main/AndroidManifest.xml

+5 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:versionName="7.5.74 (µg v0.01)">



    <uses-sdk

        android:minSdkVersion="10"

        android:minSdkVersion="14"

        android:targetSdkVersion="22" />



    <permission
@@ -51,6 +51,7 @@ 
        android:description="@string/permission_service_writely_description"

        android:label="@string/permission_service_writely_label"

        android:protectionLevel="dangerous" />



    <permission

        android:name="org.microg.gms.STATUS_BROADCAST"

        android:label="@string/perm_status_broadcast_label"
@@ -187,6 +188,7 @@ 
                    android:scheme="android_secret_code" />

            </intent-filter>

        </receiver>

        <receiver android:name="org.microg.gms.gcm.PendingReceiver" />



        <!-- DroidGuard -->
@@ -337,7 +339,8 @@ 
        <activity

            android:name="org.microg.gms.ui.SettingsActivity"

            android:icon="@drawable/ic_microg_app"

            android:label="@string/gms_settings_name">

            android:label="@string/gms_settings_name"

            android:theme="@style/SettingsTheme">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />