Feature/app icon resumption #63
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 task
jacobkeeler
requested changes
May 30, 2018
app/model/sdl/Abstract/Model.js
Outdated
| @@ -1,5 +1,4 @@ | |||
| /* | |||
| * Copyright (c) 2013, Ford Motor Company All rights reserved. | |||
| /* * Copyright (c) 2013, Ford Motor Company All rights reserved. | |||
There was a problem hiding this comment.
Looks like a mistaken change
There was a problem hiding this comment.
@jacobkeeler yes, thanks.
Fixed in 1e55a6e
| exitCommand | ||
| ); | ||
| }, | ||
|
|
There was a problem hiding this comment.
@jacobkeeler reverted in 1e55a6e
app/model/sdl/RModel.js
Outdated
| }, | ||
| applicationModels: { | ||
| 0: SDL.SDLMediaModel, | ||
| 1: SDL.SDLNonMediaModel |
There was a problem hiding this comment.
@jacobkeeler reverted in 1e55a6e
Jack-Byrne
approved these changes
Aug 29, 2018
|
@LuxoftAKutsan @AKalinich-Luxoft Please review merge conflict with develop template images changes. Thank you! |
Fixes in setAppIcon logic
Also fixed formatting and added description
AKalinich-Luxoft
force-pushed
the
feature/app_icon_resumption
branch
from
1e55a6e to
583b780
Compare
|
@JackLivio merge conflicts have been resolved |
Merged
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1456
This PR is ready for review.
Risk
This PR makes minor API changes.
Testing Plan
Test scripts PR : smartdevicelink/sdl_atf_test_scripts#1867
HMI PR : #63
Summary
This PR contains the implementation of proposal https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals/0041-appicon-resumption.md
CLA