diff options
| author | BrettyWhite <geekman3454@protonmail.com> | 2019-07-19 11:39:55 -0400 |
|---|---|---|
| committer | BrettyWhite <geekman3454@protonmail.com> | 2019-07-19 11:39:55 -0400 |
| commit | 68d30890e38c92c1a26995679bf546d3943d99e9 (patch) | |
| tree | 52751176a187bb1834b49d707845a8f3d1185d63 | |
| parent | 96d194b23463ef1046a19ff19379b51040cf5bd0 (diff) | |
| download | sdl_android-68d30890e38c92c1a26995679bf546d3943d99e9.tar.gz | |
set submenu layout in manager
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java index 54179194a..20d274442 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java @@ -59,6 +59,7 @@ import com.smartdevicelink.proxy.rpc.SetGlobalProperties; import com.smartdevicelink.proxy.rpc.enums.DisplayType; import com.smartdevicelink.proxy.rpc.enums.HMILevel; import com.smartdevicelink.proxy.rpc.enums.ImageFieldName; +import com.smartdevicelink.proxy.rpc.enums.MenuLayout; import com.smartdevicelink.proxy.rpc.enums.Result; import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType; import com.smartdevicelink.proxy.rpc.enums.SystemContext; @@ -116,6 +117,8 @@ abstract class BaseMenuManager extends BaseSubManager { lastMenuId = menuCellIdMin; dynamicMenuUpdatesMode = DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE; sdlMsgVersion = internalInterface.getSdlMsgVersion(); + // default menu configuration + menuConfiguration = new MenuConfiguration(MenuLayout.LIST, MenuLayout.LIST); addListeners(); } @@ -266,7 +269,7 @@ abstract class BaseMenuManager extends BaseSubManager { } if (sdlMsgVersion.getMajorVersion() < 6){ - DebugTool.logWarning("Menu configurations is only supported on head units with RPC spec version 6.0.0 or later. Currently connected head unit RPC spec version is"+sdlMsgVersion.getMajorVersion() + "." + sdlMsgVersion.getMinorVersion()+ "." +sdlMsgVersion.getPatchVersion()); + DebugTool.logWarning("Menu configurations is only supported on head units with RPC spec version 6.0.0 or later. Currently connected head unit RPC spec version is: "+sdlMsgVersion.getMajorVersion() + "." + sdlMsgVersion.getMinorVersion()+ "." +sdlMsgVersion.getPatchVersion()); return; } @@ -884,6 +887,7 @@ abstract class BaseMenuManager extends BaseSubManager { private AddSubMenu subMenuCommandForMenuCell(MenuCell cell, boolean shouldHaveArtwork, int position){ AddSubMenu subMenu = new AddSubMenu(cell.getCellId(), cell.getTitle()); subMenu.setPosition(position); + subMenu.setMenuLayout((cell.getSubMenuLayout() != null ? cell.getSubMenuLayout() : menuConfiguration.getSubMenuLayout())); subMenu.setMenuIcon((shouldHaveArtwork && (cell.getIcon()!= null && cell.getIcon().getImageRPC() != null)) ? cell.getIcon().getImageRPC() : null); return subMenu; } |