diff --git a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java index 63c2685d4e..e96115d4c9 100644 --- a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java +++ b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java @@ -522,7 +522,7 @@ public class ListenerService extends WearableListenerService implements GoogleAp intent.putExtras(params); startActivity(intent); } else { - showConfirmationDialog(title, message, actionstring); + showConfirmationDialog(message, actionstring); } } else if (path.equals(NEW_STATUS_PATH)) { @@ -680,12 +680,10 @@ public class ListenerService extends WearableListenerService implements GoogleAp notificationManager.createNotificationChannel(channel); } - private void showConfirmationDialog(String title, String message, String actionstring) { - + private void showConfirmationDialog(String message, String actionstring) { Intent intent = new Intent(this, AcceptActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); Bundle params = new Bundle(); - params.putString("title", title); params.putString("message", message); params.putString("actionstring", actionstring); intent.putExtras(params); diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java index a382642667..1abd5a9973 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java @@ -21,7 +21,6 @@ import info.nightscout.androidaps.data.ListenerService; public class AcceptActivity extends ViewSelectorActivity { - String title = ""; String message = ""; String actionstring = ""; private DismissThread dismissThread; @@ -34,7 +33,6 @@ public class AcceptActivity extends ViewSelectorActivity { dismissThread.start(); Bundle extras = getIntent().getExtras(); - title = extras.getString("title", ""); message = extras.getString("message", ""); actionstring = extras.getString("actionstring", ""); @@ -43,7 +41,6 @@ public class AcceptActivity extends ViewSelectorActivity { return; } - setContentView(R.layout.grid_layout); setAdapter(new MyGridViewPagerAdapter()); Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE); @@ -73,8 +70,6 @@ public class AcceptActivity extends ViewSelectorActivity { if (col == 0) { final View view = LayoutInflater.from(getApplicationContext()).inflate(R.layout.action_confirm_text, container, false); - final TextView headingView = view.findViewById(R.id.title); - headingView.setText(title); final TextView textView = view.findViewById(R.id.message); textView.setText(message); container.addView(view); diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java index 1caa5cfe05..e8ea60b0a4 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java @@ -86,7 +86,7 @@ public class WizardActivity extends ViewSelectorActivity { @Override public void onClick(View v) { - //check if it can happen that the fagment is never created that hold data? + // check if it can happen that the fragment is never created that hold data? // (you have to swipe past them anyways - but still) int percentage = 100; diff --git a/wear/src/main/res/layout/action_confirm_text.xml b/wear/src/main/res/layout/action_confirm_text.xml index 9e6355949f..d5924e29c1 100644 --- a/wear/src/main/res/layout/action_confirm_text.xml +++ b/wear/src/main/res/layout/action_confirm_text.xml @@ -13,27 +13,13 @@ - - - - - - + android:text="message" + android:textAppearance="@style/TextAppearance.Wearable.Small" + android:textColor="@color/white" />