caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Restore more formatting

Browse source
This commit is contained in:
Bart Sopers 2020-05-04 23:36:00 +02:00
parent acf6b50b66
commit d8eb777b4c
23 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/AndroidManifest.xml
View file

@ -54,7 +54,6 @@
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -231,11 +230,11 @@
<service <service
android:name=".plugins.general.nsclient.services.NSClientService" android:name=".plugins.general.nsclient.services.NSClientService"
android:enabled="true" android:enabled="true"
android:exported="false" /> android:exported="true" />
<service <service
android:name=".services.AlarmSoundService" android:name=".services.AlarmSoundService"
android:enabled="true" android:enabled="true"
android:exported="false" /> android:exported="true" />
<service <service
android:name=".plugins.general.overview.notifications.DismissNotificationService" android:name=".plugins.general.overview.notifications.DismissNotificationService"
android:exported="false" /> android:exported="false" />
@ -298,6 +297,8 @@
android:theme="@style/Theme.AppCompat.NoTitle" /> android:theme="@style/Theme.AppCompat.NoTitle" />
<activity android:name=".plugins.pump.medtronic.dialog.MedtronicHistoryActivity" /> <activity android:name=".plugins.pump.medtronic.dialog.MedtronicHistoryActivity" />
<uses-library android:name="org.apache.http.legacy" android:required="false"/>
<!-- Omnipod service and activities --> <!-- Omnipod service and activities -->
<service <service
android:name=".plugins.pump.omnipod.service.RileyLinkOmnipodService" android:name=".plugins.pump.omnipod.service.RileyLinkOmnipodService"

2
app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
View file

@ -18,8 +18,6 @@ class ErrorHelperActivity : DialogAppCompatActivity() {
errorDialog.status = intent.getStringExtra("status") errorDialog.status = intent.getStringExtra("status")
errorDialog.sound = intent.getIntExtra("soundid", R.raw.error) errorDialog.sound = intent.getIntExtra("soundid", R.raw.error)
errorDialog.title = intent.getStringExtra("title") errorDialog.title = intent.getStringExtra("title")
//if (intent.hasExtra("clipboardContent"))
// errorDialog.clipboardContent = intent.getStringExtra("clipboardContent")
errorDialog.show(supportFragmentManager, "Error") errorDialog.show(supportFragmentManager, "Error")
if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) { if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {

8
gradle.properties
View file

@ -1,17 +1,23 @@
# Project-wide Gradle settings. # Project-wide Gradle settings.
# IDE (e.g. Android Studio) users: # IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override* # Gradle settings configured through the IDE *will override*
# any settings specified in this file. # any settings specified in this file.
# For more details on how to configure your build environment visit # For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html # http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m # Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2g org.gradle.jvmargs=-Xmx2g
android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
android.useAndroidX=true