diff options
| author | Sho Amano <samano@xevo.com> | 2018-08-09 21:01:58 +0900 |
|---|---|---|
| committer | Sho Amano <samano@xevo.com> | 2018-08-09 22:32:13 +0900 |
| commit | f0cff660f098eea0a1d48979734516a4965c44c0 (patch) | |
| tree | 04893006d6f63ec2360ae8e1f2f4ceacff6c3c44 /SmartDeviceLink/SDLImage.m | |
| parent | 114f9c69f68b0255331236585a338e49069dd62e (diff) | |
| parent | 3cb0f3be950203b8c0737ffe36debb2628d8d707 (diff) | |
| download | sdl_ios-f0cff660f098eea0a1d48979734516a4965c44c0.tar.gz | |
Merge branch 'develop' into feature/multiple_transports
Conflicts:
SmartDeviceLink-iOS.xcodeproj/project.pbxproj
SmartDeviceLink/SDLCarWindow.m
SmartDeviceLink/SDLLifecycleManager.m
SmartDeviceLink/SDLStreamingAudioLifecycleManager.h
SmartDeviceLink/SDLStreamingAudioLifecycleManager.m
SmartDeviceLink/SDLStreamingMediaManager.m
SmartDeviceLink/SDLStreamingVideoLifecycleManager.h
SmartDeviceLink/SDLStreamingVideoLifecycleManager.m
SmartDeviceLinkTests/DevAPISpecs/SDLStreamingVideoLifecycleManagerSpec.m
SmartDeviceLinkTests/SDLStreamingMediaLifecycleManagerSpec.m
SmartDeviceLinkTests/SDLStreamingVideoLifecycleManagerSpec.m
Diffstat (limited to 'SmartDeviceLink/SDLImage.m')
| -rw-r--r-- | SmartDeviceLink/SDLImage.m | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/SmartDeviceLink/SDLImage.m b/SmartDeviceLink/SDLImage.m index e04de1563..fcf05819a 100644 --- a/SmartDeviceLink/SDLImage.m +++ b/SmartDeviceLink/SDLImage.m @@ -50,6 +50,10 @@ NS_ASSUME_NONNULL_BEGIN return [self initWithName:value ofType:SDLImageTypeStatic isTemplate:YES]; } +- (instancetype)initWithStaticIconName:(SDLStaticIconName)staticIconName { + return [self initWithName:staticIconName ofType:SDLImageTypeStatic isTemplate:YES]; +} + #pragma mark - Getters / Setters - (void)setValue:(NSString *)value { |