caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Remove 'queued activities' from ComboFragment.

Browse source 
(cherry picked from commit 57a4449)
This commit is contained in:
Johannes Mockenhaupt 2018-01-07 17:54:01 +01:00
parent ad54c67c23
commit 723bcc4ee3
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
View file

@ -35,8 +35,6 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
private Button alertsButton; private Button alertsButton;
private Button tddsButton; private Button tddsButton;
private Button fullHistoryButton; private Button fullHistoryButton;
private TextView queueView;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
@ -49,7 +47,6 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
reservoirView = (TextView) view.findViewById(R.id.combo_insulinstate); reservoirView = (TextView) view.findViewById(R.id.combo_insulinstate);
lastConnectionView = (TextView) view.findViewById(R.id.combo_lastconnection); lastConnectionView = (TextView) view.findViewById(R.id.combo_lastconnection);
tempBasalText = (TextView) view.findViewById(R.id.combo_temp_basal); tempBasalText = (TextView) view.findViewById(R.id.combo_temp_basal);
queueView = (TextView) view.findViewById(R.id.combo_queue);
refreshButton = (Button) view.findViewById(R.id.combo_refresh_button); refreshButton = (Button) view.findViewById(R.id.combo_refresh_button);
refreshButton.setOnClickListener(this); refreshButton.setOnClickListener(this);
@ -210,16 +207,6 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
} }
} }
tempBasalText.setText(tbrStr); tempBasalText.setText(tbrStr);
// TODO clean up & i18n or remove
// Queued activities
Spanned status = ConfigBuilderPlugin.getCommandQueue().spannedStatus();
if (status.toString().equals("")) {
queueView.setVisibility(View.GONE);
} else {
queueView.setVisibility(View.VISIBLE);
queueView.setText("Queued activities:\n" + status);
}
} }
}); });
} }

8
app/src/main/res/layout/combopump_fragment.xml
View file

@ -336,14 +336,6 @@
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:background="@color/listdelimiter" /> android:background="@color/listdelimiter" />
<TextView
android:id="@+id/combo_queue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text=""
android:textAlignment="center" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>