diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2021-01-07 10:53:58 -0500 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2021-01-07 10:53:58 -0500 |
| commit | 6c4a24d3b3e82a5b6c8299aa8b3b10f224cb64f2 (patch) | |
| tree | a2730e94eaafa1451bd3eeaf62191cfbf8f698b1 | |
| parent | 5e9d421efa41635fb9f26276a69d5cf6f1e9f0b1 (diff) | |
| parent | eed7573e24135c530c346ac664d505d1c5a6243e (diff) | |
| download | sdl_android-6c4a24d3b3e82a5b6c8299aa8b3b10f224cb64f2.tar.gz | |
Merge branch 'develop' into feature/file_manager_refactor
3 files changed, 3 insertions, 9 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java index 1c665da8c..71f5af634 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java @@ -56,10 +56,7 @@ class TextAndGraphicManager extends BaseTextAndGraphicManager { @Override SdlArtwork getBlankArtwork() { if (blankArtwork == null) { - blankArtwork = new SdlArtwork(); - blankArtwork.setType(FileType.GRAPHIC_PNG); - blankArtwork.setName("blankArtwork"); - blankArtwork.setResourceId(R.drawable.transparent); + blankArtwork = new SdlArtwork("blankArtwork", FileType.GRAPHIC_PNG, R.drawable.transparent, true); } return blankArtwork; } diff --git a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java b/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java index 0348cc1e7..261525b29 100644 --- a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java @@ -77,7 +77,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; abstract class BaseSdlManager { - static final String TAG = "BaseSubManager"; + static final String TAG = "BaseSdlManager"; final Object STATE_LOCK = new Object(); int state = -1; String appId, appName, shortAppName, resumeHash; diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java index b479e3ba5..575809538 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java @@ -54,10 +54,7 @@ class TextAndGraphicManager extends BaseTextAndGraphicManager { @Override SdlArtwork getBlankArtwork() { if (blankArtwork == null) { - blankArtwork = new SdlArtwork(); - blankArtwork.setType(FileType.GRAPHIC_PNG); - blankArtwork.setName("blankArtwork"); - blankArtwork.setFileData(new byte[50]); + blankArtwork = new SdlArtwork("blankArtwork", FileType.GRAPHIC_PNG, new byte[50], true); } return blankArtwork; } |