caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2272 from Philoul/Wear_Minor_Corrections

Browse source 
Wear minor corrections
This commit is contained in:
Milos Kozak 2019-12-14 20:40:30 +01:00 committed by GitHub
commit d01f316ad2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
View file

@ -34,6 +34,7 @@ import com.ustwo.clockwise.common.WatchShape;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import info.nightscout.androidaps.aaps;
import info.nightscout.androidaps.complications.BaseComplicationProviderService; import info.nightscout.androidaps.complications.BaseComplicationProviderService;
import info.nightscout.androidaps.data.RawDisplayData; import info.nightscout.androidaps.data.RawDisplayData;
import info.nightscout.androidaps.data.ListenerService; import info.nightscout.androidaps.data.ListenerService;
@ -341,7 +342,7 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferen
mIOB1.setText(rawData.sIOB1); mIOB1.setText(rawData.sIOB1);
mIOB2.setText(rawData.sIOB2); mIOB2.setText(rawData.sIOB2);
} else { } else {
mIOB1.setText("IOB"); mIOB1.setText(aaps.gs(R.string.activity_IOB));
mIOB2.setText(rawData.sIOB1); mIOB2.setText(rawData.sIOB1);
} }
} else { } else {

8
wear/src/main/res/xml/preferences.xml
View file

@ -133,14 +133,6 @@
app:wear_iconOff="@drawable/settings_off" app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/> app:wear_iconOn="@drawable/settings_on"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="match_divider"
android:summary="Status bar divider background matches watchface background"
android:title="Matching divider"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>
<ListPreference <ListPreference
android:defaultValue="3" android:defaultValue="3"
android:entries="@array/chart_timeframe" android:entries="@array/chart_timeframe"