diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..eac07ac41 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,33 @@ +[submodule "com.aware.plugin.device_usage"] + path = com.aware.plugin.device_usage + url = https://github.com/denzilferreira/com.aware.plugin.device_usage.git +[submodule "com.aware.plugin.ambient_noise"] + path = com.aware.plugin.ambient_noise + url = https://github.com/denzilferreira/com.aware.plugin.ambient_noise.git +[submodule "com.aware.plugin.contacts_list"] + path = com.aware.plugin.contacts_list + url = https://github.com/denzilferreira/com.aware.plugin.contacts_list.git +[submodule "com.aware.plugin.studentlife.audio"] + path = com.aware.plugin.studentlife.audio + url = https://github.com/denzilferreira/com.aware.plugin.studentlife.audio +[submodule "com.aware.plugin.fitbit"] + path = com.aware.plugin.fitbit + url = https://github.com/denzilferreira/com.aware.plugin.fitbit +[submodule "com.aware.plugin.google.activity_recognition"] + path = com.aware.plugin.google.activity_recognition + url = https://github.com/denzilferreira/com.aware.plugin.google.activity_recognition +[submodule "com.aware.plugin.google.auth"] + path = com.aware.plugin.google.auth + url = https://github.com/denzilferreira/com.aware.plugin.google.auth +[submodule "com.aware.plugin.google.fused_location"] + path = com.aware.plugin.google.fused_location + url = https://github.com/denzilferreira/com.aware.plugin.google.fused_location +[submodule "com.aware.plugin.openweather"] + path = com.aware.plugin.openweather + url = https://github.com/denzilferreira/com.aware.plugin.openweather +[submodule "com.aware.plugin.esm.scheduler"] + path = com.aware.plugin.esm.scheduler + url = https://github.com/denzilferreira/com.aware.plugin.esm.scheduler +[submodule "com.aware.plugin.sensortag"] + path = com.aware.plugin.sensortag + url = https://github.com/denzilferreira/com.aware.plugin.sensortag diff --git a/aware-core/aware.gradle b/aware-core/aware.gradle index e5a785412..ca834f155 100644 --- a/aware-core/aware.gradle +++ b/aware-core/aware.gradle @@ -3,8 +3,8 @@ ext { ion_libs = "2.+" support_libs = "28.0.0" google_libs = "16.0.0" - version_code = 711 - version_readable = "4.0." + version_code + "." + "legacy" + version_code = 803 + version_readable = "4.0." + version_code + "." + "selfie" compile_sdk = 28 target_sdk = 26 minimum_sdk = 19 diff --git a/aware-core/build.gradle b/aware-core/build.gradle index c4ccfc1bc..07ac472b8 100644 --- a/aware-core/build.gradle +++ b/aware-core/build.gradle @@ -66,11 +66,16 @@ if (System.getenv("storeFile") != null && System.getenv("storePassword") != null android.buildTypes.release.signingConfig = null } +repositories { + maven { url "https://jitpack.io" } //MPAndroidChart, AWARE +} + dependencies { implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:$mqtt_libs" implementation "com.koushikdutta.ion:ion:$ion_libs" implementation "com.android.support:gridlayout-v7:$support_libs" implementation "com.android.support:appcompat-v7:$support_libs" implementation "com.android.support:design:$support_libs" + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0-alpha' } diff --git a/aware-core/src/main/java/com/aware/Traffic.java b/aware-core/src/main/java/com/aware/Traffic.java index eb396ee71..92accba0c 100644 --- a/aware-core/src/main/java/com/aware/Traffic.java +++ b/aware-core/src/main/java/com/aware/Traffic.java @@ -235,7 +235,11 @@ public void onDataActivity(int direction) { public void onDestroy() { super.onDestroy(); - telephonyManager.listen(networkTrafficObserver, PhoneStateListener.LISTEN_NONE); + try { + telephonyManager.listen(networkTrafficObserver, PhoneStateListener.LISTEN_NONE); + } catch (NullPointerException e) { + e.printStackTrace(); + } ContentResolver.setSyncAutomatically(Aware.getAWAREAccount(this), Traffic_Provider.getAuthority(this), false); ContentResolver.removePeriodicSync( diff --git a/aware-core/src/main/java/com/aware/utils/Aware_Plugin.java b/aware-core/src/main/java/com/aware/utils/Aware_Plugin.java index 063d947f1..922045fc9 100644 --- a/aware-core/src/main/java/com/aware/utils/Aware_Plugin.java +++ b/aware-core/src/main/java/com/aware/utils/Aware_Plugin.java @@ -71,7 +71,6 @@ public class Aware_Plugin extends Service { public void onCreate() { super.onCreate(); - //Register Context Broadcaster IntentFilter filter = new IntentFilter(); filter.addAction(Aware.ACTION_AWARE_CURRENT_CONTEXT); @@ -125,7 +124,7 @@ public int onStartCommand(Intent intent, int flags, int startId) { startService(aware); } - Aware.startAWARE(getApplicationContext()); + //Aware.startAWARE(getApplicationContext()); //Aware.debug(this, "active: " + getClass().getName() + " package: " + getPackageName()); } diff --git a/aware-core/src/main/java/com/aware/utils/DatabaseHelper.java b/aware-core/src/main/java/com/aware/utils/DatabaseHelper.java index bb9e4c938..e19193709 100644 --- a/aware-core/src/main/java/com/aware/utils/DatabaseHelper.java +++ b/aware-core/src/main/java/com/aware/utils/DatabaseHelper.java @@ -17,6 +17,7 @@ import android.text.TextUtils; import android.util.Log; +import com.aware.Aware; import com.aware.R; import org.json.JSONArray; @@ -235,8 +236,12 @@ private synchronized SQLiteDatabase getDatabaseFile() { // sdcard/AWARE/ (shareable, does not delete when uninstalling) aware_folder = new File(Environment.getExternalStoragePublicDirectory("AWARE").toString()); } else { - // sdcard/Android//AWARE/ (not shareable, deletes when uninstalling package) - aware_folder = new File(ContextCompat.getExternalFilesDirs(mContext, null)[0] + "/AWARE"); + if (isEmulator()) { + aware_folder = mContext.getFilesDir(); + } else { + // sdcard/Android//AWARE/ (not shareable, deletes when uninstalling package) + aware_folder = new File(ContextCompat.getExternalFilesDirs(mContext, null)[0] + "/AWARE"); + } } if (!aware_folder.exists()) { @@ -249,4 +254,15 @@ private synchronized SQLiteDatabase getDatabaseFile() { return null; } } + + public static boolean isEmulator() { + return Build.FINGERPRINT.startsWith("generic") + || Build.FINGERPRINT.startsWith("unknown") + || Build.MODEL.contains("google_sdk") + || Build.MODEL.contains("Emulator") + || Build.MODEL.contains("Android SDK built for x86") + || Build.MANUFACTURER.contains("Genymotion") + || (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")) + || "google_sdk".equals(Build.PRODUCT); + } } diff --git a/aware-phone/build.gradle b/aware-phone/build.gradle index ea697af81..ce1922f92 100755 --- a/aware-phone/build.gradle +++ b/aware-phone/build.gradle @@ -39,6 +39,26 @@ android { resValue "string", "provider_timezones", android.defaultConfig.applicationId + ".provider.timezone" resValue "string", "provider_traffic", android.defaultConfig.applicationId + ".provider.traffic" resValue "string", "provider_wifi", android.defaultConfig.applicationId + ".provider.wifi" + + //plugins + resValue "string", "provider_device_usage", android.defaultConfig.applicationId + ".provider.device_usage" + resValue "string", "provider_ambient_noise", android.defaultConfig.applicationId + ".provider.ambient_noise" + resValue "string", "provider_contacts_list", android.defaultConfig.applicationId + ".provider.contacts_list" + resValue "string", "provider_conversations", android.defaultConfig.applicationId + ".provider.audio_final" + resValue "string", "provider_fitbit", android.defaultConfig.applicationId + ".provider.fitbit" + resValue "string", "provider_google_activity_recognition", android.defaultConfig.applicationId + ".provider.gar" + resValue "string", "provider_google_login", android.defaultConfig.applicationId + ".provider.google_login" + resValue "string", "provider_google_fused", android.defaultConfig.applicationId + ".provider.geofences" + resValue "string", "provider_openweather", android.defaultConfig.applicationId + ".provider.openweather" + resValue "string", "provider_sensortag", android.defaultConfig.applicationId + ".provider.sensortag" + } + + splits { + abi { + enable true + reset() + include 'armeabi', 'x86' + } } signingConfigs { @@ -56,6 +76,18 @@ android { lintOptions { abortOnError false } + + packagingOptions { + exclude 'META-INF/DEPENDENCIES' + exclude 'META-INF/LICENSE' + exclude 'META-INF/LICENSE.txt' + exclude 'META-INF/license.txt' + exclude 'META-INF/NOTICE' + exclude 'META-INF/NOTICE.txt' + exclude 'META-INF/notice.txt' + exclude 'META-INF/ASL2.0' + exclude 'META-INF/proguard/androidx-annotations.pro' + } } if (System.getenv("storeFile") != null && System.getenv("storePassword") != null && System.getenv("keyAlias") != null && System.getenv("keyPassword") != null) { @@ -75,9 +107,44 @@ repositories { dependencies { implementation "com.android.support:cardview-v7:$support_libs" implementation "com.android.support:design:$support_libs" + implementation('me.dm7.barcodescanner:zbar:1.8.4') { exclude group: 'com.android.support', module: "support-v4" } api project(':aware-core') + + api (project(":com.aware.plugin.device_usage")) { + exclude group:'com.github.denzilferreira',module:'aware-client' + } + api (project(":com.aware.plugin.ambient_noise")) { + exclude group:'com.github.denzilferreira',module:'aware-client' + } + api (project(":com.aware.plugin.contacts_list")) { + exclude group:'com.github.denzilferreira',module:'aware-client' + } + api (project(":com.aware.plugin.studentlife.audio")) { + exclude group:'com.github.denzilferreira',module:'aware-client' + } + api (project(":com.aware.plugin.fitbit")) { + exclude group:'com.github.denzilferreira',module:'aware-client' + } + api (project(":com.aware.plugin.google.activity_recognition")) { + exclude group:'com.github.denzilferreira',module:'aware-client' + } + api (project(":com.aware.plugin.google.auth")) { + exclude group:'com.github.denzilferreira',module:'aware-client' + } + api (project(":com.aware.plugin.google.fused_location")) { + exclude group:'com.github.denzilferreira',module:'aware-client' + } + api (project(":com.aware.plugin.openweather")) { + exclude group:'com.github.denzilferreira',module:'aware-client' + } + api (project(":com.aware.plugin.esm.scheduler")) { + exclude group:'com.github.denzilferreira',module:'aware-client' + } + api (project(":com.aware.plugin.sensortag")) { + exclude group:'com.github.denzilferreira',module:'aware-client' + } } diff --git a/aware-phone/google-services.json b/aware-phone/google-services.json new file mode 100644 index 000000000..605f50b11 --- /dev/null +++ b/aware-phone/google-services.json @@ -0,0 +1 @@ +{"installed":{"client_id":"209043386748-2f9a0ar2g597hs9731md76v1sqv33i1t.apps.googleusercontent.com","project_id":"aware-client-leg-1545138814121","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://www.googleapis.com/oauth2/v3/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","redirect_uris":["urn:ietf:wg:oauth:2.0:oob","http://localhost"]}} \ No newline at end of file diff --git a/aware-phone/src/main/AndroidManifest.xml b/aware-phone/src/main/AndroidManifest.xml index 9e441dc39..74b06961f 100755 --- a/aware-phone/src/main/AndroidManifest.xml +++ b/aware-phone/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + @@ -125,7 +123,6 @@ @@ -142,8 +139,7 @@ + android:name="com.aware.Aware$AndroidPackageMonitor" android:exported="true"> @@ -153,9 +149,7 @@ + android:name="com.aware.Aware$AwareBoot"> diff --git a/aware-phone/src/main/java/com/aware/phone/Aware_Client.java b/aware-phone/src/main/java/com/aware/phone/Aware_Client.java index fcb57ee30..4b4b3b838 100755 --- a/aware-phone/src/main/java/com/aware/phone/Aware_Client.java +++ b/aware-phone/src/main/java/com/aware/phone/Aware_Client.java @@ -18,6 +18,7 @@ import android.graphics.drawable.Drawable; import android.hardware.Sensor; import android.hardware.SensorManager; +import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; @@ -28,6 +29,7 @@ import android.preference.PreferenceGroup; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; +import android.provider.Settings; import android.support.v4.content.ContextCompat; import android.support.v4.content.PermissionChecker; import android.support.v7.widget.Toolbar; @@ -119,6 +121,7 @@ protected void onCreate(Bundle savedInstanceState) { REQUIRED_PERMISSIONS.add(Manifest.permission.WRITE_SYNC_SETTINGS); REQUIRED_PERMISSIONS.add(Manifest.permission.READ_SYNC_SETTINGS); REQUIRED_PERMISSIONS.add(Manifest.permission.READ_SYNC_STATS); + REQUIRED_PERMISSIONS.add(Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS); if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) REQUIRED_PERMISSIONS.add(Manifest.permission.FOREGROUND_SERVICE); @@ -141,6 +144,12 @@ protected void onCreate(Bundle savedInstanceState) { awarePackages.addAction(Intent.ACTION_PACKAGE_REMOVED); awarePackages.addDataScheme("package"); registerReceiver(packageMonitor, awarePackages); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + Intent whitelisting = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS); + whitelisting.setData(Uri.parse("package:" + getPackageName())); + startActivity(whitelisting); + } } @Override @@ -371,7 +380,7 @@ protected void onResume() { } //Check if AWARE is allowed to run on Doze - Aware.isBatteryOptimizationIgnored(this, getPackageName()); + //Aware.isBatteryOptimizationIgnored(this, getPackageName()); prefs.registerOnSharedPreferenceChangeListener(this); diff --git a/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java b/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java index 8034a8bf2..c9c7afa76 100755 --- a/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java +++ b/aware-phone/src/main/java/com/aware/phone/ui/Aware_Join_Study.java @@ -20,16 +20,14 @@ import android.support.v7.app.AlertDialog; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.text.Editable; import android.text.Html; +import android.text.TextWatcher; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.LinearLayout; -import android.widget.TextView; -import android.widget.Toast; +import android.widget.*; import com.aware.Aware; import com.aware.Aware_Preferences; @@ -81,6 +79,22 @@ protected void onCreate(Bundle savedInstanceState) { btnAction = (Button) findViewById(R.id.btn_sign_up); btnQuit = (Button) findViewById(R.id.btn_quit_study); + EditText participant_label = findViewById(R.id.participant_label); + participant_label.setText(Aware.getSetting(getApplicationContext(), Aware_Preferences.DEVICE_LABEL)); + participant_label.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + Aware.setSetting(getApplicationContext(), Aware_Preferences.DEVICE_LABEL, s.toString()); + } + + @Override + public void afterTextChanged(Editable s) { + } + }); + pluginsRecyclerView = (RecyclerView) findViewById(R.id.rv_plugins); mLayoutManager = new LinearLayoutManager(this); pluginsRecyclerView.setLayoutManager(mLayoutManager); diff --git a/aware-phone/src/main/java/com/aware/phone/ui/Plugins_Manager.java b/aware-phone/src/main/java/com/aware/phone/ui/Plugins_Manager.java index e2d91a877..ab288c882 100755 --- a/aware-phone/src/main/java/com/aware/phone/ui/Plugins_Manager.java +++ b/aware-phone/src/main/java/com/aware/phone/ui/Plugins_Manager.java @@ -79,6 +79,17 @@ protected void onCreate(Bundle savedInstanceState) { private void restoreBundled() { if (!getApplicationContext().getResources().getBoolean(R.bool.standalone)) return; + //If we already restored bundled, do nothing + boolean bundledRestored = false; + Cursor bundled = getContentResolver().query(Aware_Plugins.CONTENT_URI, null, Aware_Plugins.PLUGIN_AUTHOR + " LIKE 'Bundle'", null, null); + if (bundled!= null && bundled.moveToFirst()) { + if (bundled.getCount() > 0) { + bundledRestored = true; + } + bundled.close(); + } + if (bundledRestored) return; + PackageManager pkgManager = getApplicationContext().getPackageManager(); try { PackageInfo bundle = pkgManager.getPackageInfo(getApplicationContext().getPackageName(), PackageManager.GET_SERVICES); @@ -113,9 +124,6 @@ private void restoreBundled() { } pluginsPackagesInstalled.append(")"); - //clean database from cached but no longer installed plugins - getContentResolver().delete(Aware_Plugins.CONTENT_URI,Aware_Plugins.PLUGIN_PACKAGE_NAME + " NOT IN " + pluginsPackagesInstalled.toString(), null); - } catch (NameNotFoundException e) { e.printStackTrace(); } diff --git a/aware-phone/src/main/java/com/aware/phone/ui/Stream_UI.java b/aware-phone/src/main/java/com/aware/phone/ui/Stream_UI.java index 407394025..8b5529e29 100755 --- a/aware-phone/src/main/java/com/aware/phone/ui/Stream_UI.java +++ b/aware-phone/src/main/java/com/aware/phone/ui/Stream_UI.java @@ -168,7 +168,28 @@ public View getView(int position, View convertView, ViewGroup parent) { final ViewHolder cardHolder; if (convertView == null) { try { - convertView = Aware.getContextCard(mContext, cards.getJSONObject(position).getString(Aware_Plugins.PLUGIN_PACKAGE_NAME)); + PackageInfo pkg = PluginsManager.isInstalled(mContext, cards.getJSONObject(position).getString(Aware_Plugins.PLUGIN_PACKAGE_NAME)); + if (pkg.versionName.equals("bundled")) { + if (cards.getJSONObject(position).getString(Aware_Plugins.PLUGIN_PACKAGE_NAME).equals("com.aware.plugin.google.auth")) { + convertView = new com.aware.plugin.google.auth.ContextCard().getContextCard(mContext); + } else if (cards.getJSONObject(position).getString(Aware_Plugins.PLUGIN_PACKAGE_NAME).equals("com.aware.plugin.device_usage")) { + convertView = new com.aware.plugin.device_usage.ContextCard().getContextCard(mContext); + } else if (cards.getJSONObject(position).getString(Aware_Plugins.PLUGIN_PACKAGE_NAME).equals("com.aware.plugin.ambient_noise")) { + convertView = new com.aware.plugin.ambient_noise.ContextCard().getContextCard(mContext); + } else if (cards.getJSONObject(position).getString(Aware_Plugins.PLUGIN_PACKAGE_NAME).equals("com.aware.plugin.fitbit")) { + convertView = new com.aware.plugin.fitbit.ContextCard().getContextCard(mContext); + } else if (cards.getJSONObject(position).getString(Aware_Plugins.PLUGIN_PACKAGE_NAME).equals("com.aware.plugin.google.activity_recognition")) { + convertView = new com.aware.plugin.google.activity_recognition.ContextCard().getContextCard(mContext); + } else if (cards.getJSONObject(position).getString(Aware_Plugins.PLUGIN_PACKAGE_NAME).equals("com.aware.plugin.google.fused_location")) { + convertView = new com.aware.plugin.google.fused_location.ContextCard().getContextCard(mContext); + } else if (cards.getJSONObject(position).getString(Aware_Plugins.PLUGIN_PACKAGE_NAME).equals("com.aware.plugin.openweather")) { + convertView = new com.aware.plugin.openweather.ContextCard().getContextCard(mContext); + } + } else { + convertView = Aware.getContextCard(mContext, cards.getJSONObject(position).getString(Aware_Plugins.PLUGIN_PACKAGE_NAME)); + } + + if (convertView == null) convertView = new View(getApplicationContext()); cardHolder = new ViewHolder(); cardHolder.card = convertView; diff --git a/aware-phone/src/main/res/layout/aware_join_study.xml b/aware-phone/src/main/res/layout/aware_join_study.xml index 44c174e85..ae0df84d5 100644 --- a/aware-phone/src/main/res/layout/aware_join_study.xml +++ b/aware-phone/src/main/res/layout/aware_join_study.xml @@ -48,6 +48,17 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:text="Researcher" /> + + diff --git a/com.aware.plugin.ambient_noise b/com.aware.plugin.ambient_noise new file mode 160000 index 000000000..44edf9aff --- /dev/null +++ b/com.aware.plugin.ambient_noise @@ -0,0 +1 @@ +Subproject commit 44edf9aff78447f72999618cd14b6ac2fb3e9784 diff --git a/com.aware.plugin.contacts_list b/com.aware.plugin.contacts_list new file mode 160000 index 000000000..c1c4d7938 --- /dev/null +++ b/com.aware.plugin.contacts_list @@ -0,0 +1 @@ +Subproject commit c1c4d7938974de1157db9bd4aa5027b9533168ce diff --git a/com.aware.plugin.device_usage b/com.aware.plugin.device_usage new file mode 160000 index 000000000..4e2def4e7 --- /dev/null +++ b/com.aware.plugin.device_usage @@ -0,0 +1 @@ +Subproject commit 4e2def4e78065b9ba7e22cb565e65c9d253662cd diff --git a/com.aware.plugin.esm.scheduler b/com.aware.plugin.esm.scheduler new file mode 160000 index 000000000..96b11769c --- /dev/null +++ b/com.aware.plugin.esm.scheduler @@ -0,0 +1 @@ +Subproject commit 96b11769c6e0e904701d3074a4054dadacb6d6da diff --git a/com.aware.plugin.fitbit b/com.aware.plugin.fitbit new file mode 160000 index 000000000..ce4673f75 --- /dev/null +++ b/com.aware.plugin.fitbit @@ -0,0 +1 @@ +Subproject commit ce4673f758d840683c14c072b1818ec3edd76b11 diff --git a/com.aware.plugin.google.activity_recognition b/com.aware.plugin.google.activity_recognition new file mode 160000 index 000000000..40ec96c13 --- /dev/null +++ b/com.aware.plugin.google.activity_recognition @@ -0,0 +1 @@ +Subproject commit 40ec96c131b27a9159f5b6c94a65467c5048288b diff --git a/com.aware.plugin.google.auth b/com.aware.plugin.google.auth new file mode 160000 index 000000000..189660ce6 --- /dev/null +++ b/com.aware.plugin.google.auth @@ -0,0 +1 @@ +Subproject commit 189660ce6873594f14bd40a8c0527021c14a23f7 diff --git a/com.aware.plugin.google.fused_location b/com.aware.plugin.google.fused_location new file mode 160000 index 000000000..a33cb1b61 --- /dev/null +++ b/com.aware.plugin.google.fused_location @@ -0,0 +1 @@ +Subproject commit a33cb1b61d433579080f8f47d8d0626a151012d3 diff --git a/com.aware.plugin.openweather b/com.aware.plugin.openweather new file mode 160000 index 000000000..a8810d0da --- /dev/null +++ b/com.aware.plugin.openweather @@ -0,0 +1 @@ +Subproject commit a8810d0da58f02ea28c450e98fdac0287a31c475 diff --git a/com.aware.plugin.sensortag b/com.aware.plugin.sensortag new file mode 160000 index 000000000..8295ef534 --- /dev/null +++ b/com.aware.plugin.sensortag @@ -0,0 +1 @@ +Subproject commit 8295ef534e6e8c724a4d84f3783b000a1d197f94 diff --git a/com.aware.plugin.studentlife.audio b/com.aware.plugin.studentlife.audio new file mode 160000 index 000000000..e69fac585 --- /dev/null +++ b/com.aware.plugin.studentlife.audio @@ -0,0 +1 @@ +Subproject commit e69fac5854f1ca887f334b4b177a0ba772f65a72 diff --git a/settings.gradle b/settings.gradle index b2f241184..af7dd62c5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,35 @@ -include ':aware-core', ':aware-phone' \ No newline at end of file + +include ':aware-core', ':aware-phone' + +include ':com.aware.plugin.device_usage' +project(':com.aware.plugin.device_usage').projectDir = new File('com.aware.plugin.device_usage/com.aware.plugin.device_usage.lib') + +include ':com.aware.plugin.ambient_noise' +project(':com.aware.plugin.ambient_noise').projectDir = new File('com.aware.plugin.ambient_noise/com.aware.plugin.ambient_noise.lib') + +include ':com.aware.plugin.contacts_list' +project(':com.aware.plugin.contacts_list').projectDir = new File('com.aware.plugin.contacts_list/com.aware.plugin.contacts_list.lib') + +include ':com.aware.plugin.studentlife.audio' +project(':com.aware.plugin.studentlife.audio').projectDir = new File('com.aware.plugin.studentlife.audio/com.aware.plugin.studentlife.audio.lib') + +include ':com.aware.plugin.fitbit' +project(':com.aware.plugin.fitbit').projectDir = new File('com.aware.plugin.fitbit/com.aware.plugin.fitbit.lib') + +include ':com.aware.plugin.google.activity_recognition' +project(':com.aware.plugin.google.activity_recognition').projectDir = new File('com.aware.plugin.google.activity_recognition/com.aware.plugin.google.activity_recognition.lib') + +include ':com.aware.plugin.google.auth' +project(':com.aware.plugin.google.auth').projectDir = new File('com.aware.plugin.google.auth/com.aware.plugin.google.auth.lib') + +include ':com.aware.plugin.google.fused_location' +project(':com.aware.plugin.google.fused_location').projectDir = new File('com.aware.plugin.google.fused_location/com.aware.plugin.google.fused_location.lib') + +include ':com.aware.plugin.openweather' +project(':com.aware.plugin.openweather').projectDir = new File('com.aware.plugin.openweather/com.aware.plugin.openweather.lib') + +include ':com.aware.plugin.esm.scheduler' +project(':com.aware.plugin.esm.scheduler').projectDir = new File('com.aware.plugin.esm.scheduler/com.aware.plugin.esm.scheduler.lib') + +include ':com.aware.plugin.sensortag' +project(':com.aware.plugin.sensortag').projectDir = new File('com.aware.plugin.sensortag/com.aware.plugin.sensortag.lib')