diff options
author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2021-11-08 13:31:09 -0500 |
---|---|---|
committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2021-11-08 13:31:09 -0500 |
commit | 923765917130f8591efbae9857df80badd3e8d71 (patch) | |
tree | c630f72e48047c423a9b20c648d009b405797e77 | |
parent | 28a8bfe49ed8aa5c2aa86886768e28f89ad445b3 (diff) | |
download | sdl_android-923765917130f8591efbae9857df80badd3e8d71.tar.gz |
Simplify cellsWithRemovedPropertiesFromCells()
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java index 9e61e3f73..994c14ad8 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java @@ -49,6 +49,7 @@ import static com.smartdevicelink.managers.screen.menu.MenuReplaceUtilities.subM import static com.smartdevicelink.managers.screen.menu.MenuReplaceUtilities.transferCellIDsFromCells; import static com.smartdevicelink.managers.screen.menu.MenuReplaceUtilities.transferCellListenersFromCells; import static com.smartdevicelink.managers.screen.menu.MenuReplaceUtilities.windowCapabilitySupportsPrimaryImage; +import static com.smartdevicelink.managers.screen.menu.MenuReplaceUtilities.windowCapabilitySupportsSecondaryImage; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.CompletionListener; @@ -466,11 +467,14 @@ class MenuReplaceOperation extends Task { // Strip away fields that cannot be used to determine uniqueness visually including fields not supported by the HMI cell.setVoiceCommands(null); - // If we're >= 5.0 && < 7.0, but don't have command icon image, no icon. If we're < 5.0 || >= 7.0 and don't have submenu icon, no icon. if (!windowCapabilitySupportsPrimaryImage(internalInterface.get(), windowCapability, cell)) { cell.setIcon(null); } + if (!windowCapabilitySupportsSecondaryImage(windowCapability, cell)) { + cell.setSecondaryArtwork(null); + } + // Check for subMenu fields supported if (cell.isSubMenuCell()) { if (!hasTextFieldOfName(windowCapability, TextFieldName.menuSubMenuSecondaryText)) { @@ -479,9 +483,6 @@ class MenuReplaceOperation extends Task { if (!hasTextFieldOfName(windowCapability, TextFieldName.menuSubMenuTertiaryText)) { cell.setTertiaryText(null); } - if (!hasImageFieldOfName(windowCapability, ImageFieldName.menuSubMenuSecondaryImage)) { - cell.setSecondaryArtwork(null); - } cell.setSubCells(cellsWithRemovedPropertiesFromCells(cell.getSubCells(), windowCapability)); } else { if (!hasTextFieldOfName(windowCapability, TextFieldName.menuCommandSecondaryText)) { @@ -490,9 +491,6 @@ class MenuReplaceOperation extends Task { if (!hasTextFieldOfName(windowCapability, TextFieldName.menuCommandTertiaryText)) { cell.setTertiaryText(null); } - if (!hasImageFieldOfName(windowCapability, ImageFieldName.menuCommandSecondaryImage)) { - cell.setSecondaryArtwork(null); - } } } return removePropertiesClone; |