caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1294 from MilosKozak/AdrianLxM-patch-1

Browse source 
timeshift can be negative on watch
This commit is contained in:
Milos Kozak 2018-08-03 00:27:36 +02:00 committed by GitHub
commit 78fab754ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java
View file

@ -29,7 +29,7 @@ public class CPPActivity extends ViewSelectorActivity {
PlusMinusEditText editTimeshift;
int percentage = -1;
int timeshift = -1;
int timeshift = -25;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -39,10 +39,12 @@ public class CPPActivity extends ViewSelectorActivity {
percentage = extras.getInt("percentage", -1);
timeshift = extras.getInt("timeshift", -1);
if (percentage ==-1 || timeshift ==-1){
if (percentage ==-1 || timeshift ==-25){
finish(); return;
}
if(timeshift < 0) timeshift += 24;
setContentView(R.layout.grid_layout);
final Resources res = getResources();
final GridViewPager pager = (GridViewPager) findViewById(R.id.pager);
@ -130,4 +132,4 @@ public class CPPActivity extends ViewSelectorActivity {
}
}
}