caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into medtronic_andy

Browse source
This commit is contained in:
Andy Rozman 2019-03-03 23:35:12 +00:00
parent 011aaf5336 f28d763ada
commit 5a8b5f3e7b
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/build.gradle
View file

@ -70,7 +70,7 @@ android {
buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"' buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'
buildConfigField "String", "DEV_VERSION", '"2.1"' buildConfigField "String", "DEV_VERSION", '"2.1"'
buildConfigField "String", "DEV_DATE", '"2.3.2019"' buildConfigField "String", "DEV_DATE", '"2.3.2019"'
buildConfigField "String", "DEV_CHECKIN", '"2ad2b11541159cb1723a44c241c8d681a8548dc5"' buildConfigField "String", "DEV_CHECKIN", '"f28d763ada9e6a8d7621b972e03edd980767e076"'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
ndk { ndk {
@ -105,7 +105,7 @@ android {
resValue "string", "app_name", "AndroidAPS" resValue "string", "app_name", "AndroidAPS"
versionName version + "-pumpcontrol" versionName version + "-pumpcontrol"
manifestPlaceholders = [ manifestPlaceholders = [
appIcon : "@mipmap/ic_launcher", appIcon: "@mipmap/ic_launcher",
appIconRound: "@mipmap/ic_launcher_round" appIconRound: "@mipmap/ic_launcher_round"
] ]
} }
@ -115,7 +115,7 @@ android {
resValue "string", "app_name", "Pumpcontrol" resValue "string", "app_name", "Pumpcontrol"
versionName version versionName version
manifestPlaceholders = [ manifestPlaceholders = [
appIcon : "@mipmap/ic_pumpcontrol", appIcon: "@mipmap/ic_pumpcontrol",
appIconRound: "@null" appIconRound: "@null"
] ]
} }
@ -125,7 +125,7 @@ android {
resValue "string", "app_name", "NSClient" resValue "string", "app_name", "NSClient"
versionName version + "-nsclient" versionName version + "-nsclient"
manifestPlaceholders = [ manifestPlaceholders = [
appIcon : "@mipmap/ic_yellowowl", appIcon: "@mipmap/ic_yellowowl",
appIconRound: "@null" appIconRound: "@null"
] ]
} }
@ -135,7 +135,7 @@ android {
resValue "string", "app_name", "NSClient2" resValue "string", "app_name", "NSClient2"
versionName version + "-nsclient" versionName version + "-nsclient"
manifestPlaceholders = [ manifestPlaceholders = [
appIcon : "@mipmap/ic_yellowowl", appIcon: "@mipmap/ic_yellowowl",
appIconRound: "@null" appIconRound: "@null"
] ]
} }
@ -150,7 +150,7 @@ android {
unitTests.includeAndroidResources = true unitTests.includeAndroidResources = true
} }
useLibrary "org.apache.http.legacy" useLibrary "org.apache.http.legacy"
} }
allprojects { allprojects {

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

@ -62,7 +62,7 @@
<activity android:name=".activities.TDDStatsActivity" /> <activity android:name=".activities.TDDStatsActivity" />
<activity android:name=".plugins.general.overview.activities.QuickWizardListActivity"> <activity android:name=".plugins.general.overview.activities.QuickWizardListActivity">
<intent-filter> <intent-filter>
<action android:name="info.nightscout.androidaps.plugins.Overview.activities.QuickWizardListActivity" /> <action android:name="info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>

2
app/src/main/res/xml/pref_insight_local.xml
View file

@ -2,7 +2,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<Preference android:title="@string/insight_pairing"> <Preference android:title="@string/insight_pairing">
<intent <intent
android:targetClass="info.nightscout.androidaps.plugins.PumpInsightLocal.activities.InsightPairingInformationActivity" android:targetClass="info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingInformationActivity"
android:targetPackage="info.nightscout.androidaps" /> android:targetPackage="info.nightscout.androidaps" />
</Preference> </Preference>

2
app/src/main/res/xml/pref_overview.xml
View file

@ -138,7 +138,7 @@
<Preference <Preference
android:key="quickwizard" android:key="quickwizard"
android:title="@string/quickwizardsettings"> android:title="@string/quickwizardsettings">
<intent android:action="info.nightscout.androidaps.plugins.Overview.activities.QuickWizardListActivity" /> <intent android:action="info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity" />
</Preference> </Preference>
<PreferenceScreen android:title="@string/advancedsettings_title" android:key="@string/key_advancedsettings"> <PreferenceScreen android:title="@string/advancedsettings_title" android:key="@string/key_advancedsettings">