Skip to content

Conversation

@JulianKast
Copy link
Contributor

@JulianKast JulianKast commented Jun 3, 2021

Fixes #1688

This PR is [ready] for review.

Risk

This PR makes [minor] API changes.

Testing Plan

  • I have verified that I have not introduced new warnings in this PR (or explain why below)
  • I have run the unit tests with this PR
  • I have tested this PR against Core and verified behavior (if applicable, if not applicable, explain why below).
  • I have tested Android, Java SE, and Java EE

Core Tests

Remove ImageFilds menuCommandSecondaryImage and menuSubMenuSecondaryImage from generic HMI as a supported field. To do this you need to remove all instances of them in src/js/controllers/DisplayCapabilities.js and rebuild the hmi

Test 1:
Step 1. With ImageField "menuCommandSecondaryImage" removed as a supported field from generic_hmi, Upload a menu with a normal cell that uses the same image for primary and secondary.

Verify: Only primary image is uploaded on menuCell.

Test 2:
With ImageField "menuSubMenuSecondaryImage" removed as a supported field from generic_hmi, Upload a menu with a menu cell that has subCells that uses the same image for primary and secondary.

Verify: Only primary image is uploaded on menuCell.

Core version / branch / commit hash / module tested against: Core 7.1
HMI name / version / branch / commit hash / module tested against: generic_hmi 0.10.0

Summary

Fix MenuManager sending a secondary image with menuCells when menuCommandSecondaryImage is not supported by HMI if file had previously uploaded

Changelog

Bug Fixes
  • Fix MenuManager sending a secondary image with menuCells when menuCommandSecondaryImage is not supported by HMI if file had previously uploaded

CLA

@codecov
Copy link

codecov bot commented Jun 3, 2021

Codecov Report

Merging #1708 (c996133) into develop (f0f1693) will increase coverage by 0.14%.
The diff coverage is 0.00%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1708      +/-   ##
=============================================
+ Coverage      54.28%   54.43%   +0.14%     
- Complexity      5363     5381      +18     
=============================================
  Files            555      555              
  Lines          24659    24797     +138     
  Branches        3131     3193      +62     
=============================================
+ Hits           13386    13498     +112     
- Misses         10108    10115       +7     
- Partials        1165     1184      +19     
Impacted Files Coverage Δ
...vicelink/managers/screen/menu/BaseMenuManager.java 45.88% <0.00%> (ø)
...nk/managers/audio/AudioDecoderCompatOperation.java 75.00% <0.00%> (-4.55%) ⬇️
...agers/screen/menu/VoiceCommandUpdateOperation.java 76.37% <0.00%> (-2.37%) ⬇️
...rtdevicelink/streaming/video/SdlRemoteDisplay.java 50.00% <0.00%> (-1.22%) ⬇️
...ink/managers/screen/BaseTextAndGraphicManager.java 64.16% <0.00%> (+0.41%) ⬆️
...anagers/lifecycle/BaseSystemCapabilityManager.java 72.26% <0.00%> (+5.93%) ⬆️

@bilal-alsharifi bilal-alsharifi merged commit 28074af into develop Jun 8, 2021
@bilal-alsharifi bilal-alsharifi deleted the bugfix/issue_1688 branch June 8, 2021 12:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants