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

Commit 09ddb3a6 authored by Gitsaibot's avatar Gitsaibot Committed by GitHub
Browse files

Merge pull request #148 from jspricke/master 

Update submodules
parents 24c419c4 2e76a9b0

.gitmodules

+3 −0
Original line number Diff line number Diff line
@@ -13,3 +13,6 @@ 
[submodule "external/ex"]

	path = external/ex

	url = https://github.com/Etar-Group/standalone-calendar-frameworks-ex.git

[submodule "external/chips"]

	path = external/chips

	url = https://github.com/Etar-Group/android_frameworks_opt_chips

build.gradle

+2 −3
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ project(':external:timezonepicker') { 
                    aidl.srcDirs = ['src']

                    renderscript.srcDirs = ['src']

                    res.srcDirs = ['res']

                    assets.srcDirs = ['assets']

            }

        }
@@ -139,7 +138,7 @@ project(':external:timezonepicker') { 
    }

}



project(':external:ex:chips') {

project(':external:chips') {

    apply plugin: 'android-library'



    android {
@@ -179,7 +178,7 @@ dependencies { 
    compile project(':external:colorpicker')

    compile project(':external:datetimepicker')

    compile project(':external:timezonepicker')

    compile project(':external:ex:chips')

    compile project(':external:chips')

}



android {

calendar @ 524cce00

Compare 2c91bad6 to 524cce00
Original line number Diff line number Diff line 
Subproject commit 2c91bad68f13199beea51b476211b9dbd16096fb
 
Subproject commit 524cce008901f0e16a59d0982c18e964473950b0

chips @ dcc9b5f4

Original line number Diff line number Diff line 
Subproject commit dcc9b5f4faa6e71cbf8e6b7dbc7be542be4ef236

colorpicker @ c1d5eb2d

Compare fee56abe to c1d5eb2d
Original line number Diff line number Diff line 
Subproject commit fee56abe1678b3012b970ea227934e5388143add
 
Subproject commit c1d5eb2d31fb6a74ed129722754139c759aedbe8