From 82c75e74b95486c4cc6a10acc83bfefc6192d85e Mon Sep 17 00:00:00 2001 From: Robert Henigan Date: Fri, 12 Mar 2021 11:07:31 -0500 Subject: Fix Main Menu UI updates do not take text field name into account (#1629) * Check for textFieldNames * Review Feedback * Remove empty line seperating doc from method * Update MenuCell Constructors * Update JavaSE MenuCell Constructors Co-authored-by: Henigan --- .../src/main/java/com/smartdevicelink/java/SdlService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'javaSE') diff --git a/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java b/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java index 8b15abaf4..c106b03fa 100644 --- a/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java +++ b/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java @@ -247,7 +247,7 @@ public class SdlService { // some voice commands List voice2 = Collections.singletonList("Cell two"); - MenuCell mainCell1 = new MenuCell("Test Cell 1 (speak)", livio, null, new MenuSelectionListener() { + MenuCell mainCell1 = new MenuCell("Test Cell 1 (speak)", "Secondary Text", "Tertiary Text", livio, livio, null, new MenuSelectionListener() { @Override public void onTriggered(TriggerSource trigger) { DebugTool.logInfo(TAG, "Test cell 1 triggered. Source: " + trigger.toString()); @@ -255,7 +255,7 @@ public class SdlService { } }); - MenuCell mainCell2 = new MenuCell("Test Cell 2", null, voice2, new MenuSelectionListener() { + MenuCell mainCell2 = new MenuCell("Test Cell 2", "Secondary Text", null, null, null, voice2, new MenuSelectionListener() { @Override public void onTriggered(TriggerSource trigger) { DebugTool.logInfo(TAG, "Test cell 2 triggered. Source: " + trigger.toString()); @@ -264,14 +264,14 @@ public class SdlService { // SUB MENU - MenuCell subCell1 = new MenuCell("SubCell 1", null, null, new MenuSelectionListener() { + MenuCell subCell1 = new MenuCell("SubCell 1", null, null, null, null, null, new MenuSelectionListener() { @Override public void onTriggered(TriggerSource trigger) { DebugTool.logInfo(TAG, "Sub cell 1 triggered. Source: " + trigger.toString()); } }); - MenuCell subCell2 = new MenuCell("SubCell 2", null, null, new MenuSelectionListener() { + MenuCell subCell2 = new MenuCell("SubCell 2", null, null, null, null, null, new MenuSelectionListener() { @Override public void onTriggered(TriggerSource trigger) { DebugTool.logInfo(TAG, "Sub cell 2 triggered. Source: " + trigger.toString()); @@ -279,16 +279,16 @@ public class SdlService { }); // sub menu parent cell - MenuCell mainCell3 = new MenuCell("Test Cell 3 (sub menu)", MenuLayout.LIST, null, Arrays.asList(subCell1, subCell2)); + MenuCell mainCell3 = new MenuCell("Test Cell 3 (sub menu)", null, null, MenuLayout.LIST, null, null, Arrays.asList(subCell1, subCell2)); - MenuCell mainCell4 = new MenuCell("Show Perform Interaction", null, null, new MenuSelectionListener() { + MenuCell mainCell4 = new MenuCell("Show Perform Interaction", null, null, null, null, null, new MenuSelectionListener() { @Override public void onTriggered(TriggerSource trigger) { showPerformInteraction(); } }); - MenuCell mainCell5 = new MenuCell("Clear the menu", null, null, new MenuSelectionListener() { + MenuCell mainCell5 = new MenuCell("Clear the menu", null, null, null,null, null, new MenuSelectionListener() { @Override public void onTriggered(TriggerSource trigger) { DebugTool.logInfo(TAG, "Clearing Menu. Source: " + trigger.toString()); -- cgit v1.2.1