diff options
| author | Brett <3911458+BrettyWhite@users.noreply.github.com> | 2019-01-17 13:52:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-17 13:52:42 -0500 |
| commit | 2facdaee8a97ac30f8964e5746d9ca496153656e (patch) | |
| tree | 8d7f5d0dd94b371f9e6d699d0e1d0a2990956817 | |
| parent | a1296c336ebe9d9aff6c79acbb8a5e2e5242c1f8 (diff) | |
| parent | 4fc26cb3d29e3f667362fa73247fe62b5583a82b (diff) | |
| download | sdl_android-2facdaee8a97ac30f8964e5746d9ca496153656e.tar.gz | |
Merge pull request #954 from NicoleYarroch/bug/issue_942_screen_manager_does_not_clear_images
Fixed the screen manager not being able to clear images
3 files changed, 15 insertions, 2 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java index e5f5803be..872e09b81 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java @@ -81,11 +81,23 @@ public class ScreenManagerTests extends AndroidTestCase2 { assertEquals(screenManager.getPrimaryGraphic(), testArtwork); } + public void testSetPrimaryGraphicWithBlankImage() { + screenManager.setPrimaryGraphic(null); + assertNotNull(screenManager.getPrimaryGraphic()); + assertEquals(screenManager.getPrimaryGraphic().getName(), "blankArtwork"); + } + public void testSetSecondaryGraphic() { screenManager.setSecondaryGraphic(testArtwork); assertEquals(screenManager.getSecondaryGraphic(), testArtwork); } + public void testSetSecondaryGraphicWithBlankImage() { + screenManager.setSecondaryGraphic(null); + assertNotNull(screenManager.getSecondaryGraphic()); + assertEquals(screenManager.getSecondaryGraphic().getName(), "blankArtwork"); + } + public void testAlignment() { screenManager.setTextAlignment(TextAlignment.LEFT_ALIGNED); assertEquals(screenManager.getTextAlignment(), TextAlignment.LEFT_ALIGNED); diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java index aaad2df24..d063f52e3 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java @@ -113,6 +113,7 @@ public class TextAndGraphicManagerTests extends AndroidTestCase2 { assertEquals(textAndGraphicManager.currentHMILevel, HMILevel.HMI_NONE); assertFalse(textAndGraphicManager.isDirty); assertEquals(textAndGraphicManager.getState(), BaseSubManager.SETTING_UP); + assertNotNull(textAndGraphicManager.getBlankArtwork()); } public void testGetMainLines(){ @@ -533,7 +534,7 @@ public class TextAndGraphicManagerTests extends AndroidTestCase2 { assertNull(textAndGraphicManager.getTextField2Type()); assertNull(textAndGraphicManager.getTextField3Type()); assertNull(textAndGraphicManager.getTextField4Type()); - assertNull(textAndGraphicManager.getBlankArtwork()); + assertNotNull(textAndGraphicManager.getBlankArtwork()); assertNull(textAndGraphicManager.currentScreenData); assertNull(textAndGraphicManager.inProgressUpdate); assertNull(textAndGraphicManager.queuedImageUpdate); diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java b/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java index 5e526b60f..397ac33c8 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java +++ b/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java @@ -674,7 +674,7 @@ class TextAndGraphicManager extends BaseSubManager { SdlArtwork getBlankArtwork(){ - if (blankArtwork != null){ + if (blankArtwork == null){ blankArtwork = new SdlArtwork(); blankArtwork.setType(FileType.GRAPHIC_PNG); blankArtwork.setName("blankArtwork"); |