From 723bcc4ee3167762d21a4434ef275dc446d61095 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Sun, 7 Jan 2018 17:54:01 +0100 Subject: [PATCH] Remove 'queued activities' from ComboFragment. (cherry picked from commit 57a4449) --- .../androidaps/plugins/PumpCombo/ComboFragment.java | 13 ------------- app/src/main/res/layout/combopump_fragment.xml | 8 -------- 2 files changed, 21 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java index 506bce7be5..8419478725 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java @@ -35,8 +35,6 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis private Button alertsButton; private Button tddsButton; private Button fullHistoryButton; - private TextView queueView; - @Override 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); lastConnectionView = (TextView) view.findViewById(R.id.combo_lastconnection); 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.setOnClickListener(this); @@ -210,16 +207,6 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis } } 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); - } } }); } diff --git a/app/src/main/res/layout/combopump_fragment.xml b/app/src/main/res/layout/combopump_fragment.xml index ecbaf90ef6..7fb016bb83 100644 --- a/app/src/main/res/layout/combopump_fragment.xml +++ b/app/src/main/res/layout/combopump_fragment.xml @@ -336,14 +336,6 @@ android:layout_marginRight="20dp" android:layout_marginTop="5dp" android:background="@color/listdelimiter" /> - - -