caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

downgrade gradle and fix mixed localisation comparison

Browse source
This commit is contained in:
AdrianLxM 2021-01-08 01:15:48 +01:00
parent 83324c97a7
commit 819a3b7d43
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -37,7 +37,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.1' classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.4' classpath 'com.google.gms:google-services:4.3.4'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

4
wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java
View file

@ -39,8 +39,8 @@ public class MainMenuActivity extends MenuListActivity {
if(!sharedPreferences.getBoolean("wearcontrol", false)){ if(!sharedPreferences.getBoolean("wearcontrol", false)){
return new String[] { return new String[] {
"Settings", aaps.gs(R.string.menu_settings),
"Re-Sync"}; aaps.gs(R.string.menu_resync)};
} }

1
wear/src/main/res/values/strings.xml
View file

@ -77,6 +77,7 @@
<string name="menu_ecarb">eCarb</string> <string name="menu_ecarb">eCarb</string>
<string name="menu_settings">Settings</string> <string name="menu_settings">Settings</string>
<string name="menu_status">Status</string> <string name="menu_status">Status</string>
<string name="menu_resync">Re-Sync</string>
<string name="menu_prime_fill">Prime/Fill</string> <string name="menu_prime_fill">Prime/Fill</string>
<string name="menu_none">None</string> <string name="menu_none">None</string>
<string name="menu_default">Default</string> <string name="menu_default">Default</string>