diff options
| author | NicoleYarroch <nicole@livio.io> | 2018-05-22 09:42:34 -0400 |
|---|---|---|
| committer | NicoleYarroch <nicole@livio.io> | 2018-05-22 09:42:34 -0400 |
| commit | 7854e92a8ad339d82ee11a797df1bc3ddb75413b (patch) | |
| tree | 976785d74d60fcfe2efd8df78102e64a0407b677 /SmartDeviceLink/SDLShow.h | |
| parent | 1c0930c8c5bf31e26a2fea8ff9d1fce06a5757d4 (diff) | |
| parent | 84c6e6f99a4aff5b62d48d9d07f4cd98ea78f80e (diff) | |
| download | sdl_ios-7854e92a8ad339d82ee11a797df1bc3ddb75413b.tar.gz | |
Merge branch 'develop' into bug/issue_97_add_remaining_documentation
Signed-off-by: NicoleYarroch <nicole@livio.io>
# Conflicts:
# SmartDeviceLink/SDLProtocolHeader.h
# SmartDeviceLink/SDLShow.h
Diffstat (limited to 'SmartDeviceLink/SDLShow.h')
| -rw-r--r-- | SmartDeviceLink/SDLShow.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/SmartDeviceLink/SDLShow.h b/SmartDeviceLink/SDLShow.h index 770a8ba1e..833a3dea1 100644 --- a/SmartDeviceLink/SDLShow.h +++ b/SmartDeviceLink/SDLShow.h @@ -226,8 +226,7 @@ NS_ASSUME_NONNULL_BEGIN /** * The Custom Presets defined by the App * - * @discussion A Vector value representing the Custom Presets defined by the - * App + * @discussion A Vector value representing the Custom Presets defined by the App * <p> * <ul> * <li>If omitted on supported displays, the presets will be shown as not defined</li> @@ -239,15 +238,11 @@ NS_ASSUME_NONNULL_BEGIN @property (strong, nonatomic, nullable) NSArray<NSString *> *customPresets; /** - * Text Field Metadata - * - * @discussion A Vector value representing the Custom Presets defined by the - * App - * <p> - * App defined metadata information. See MetadataStruct. Uses mainField1, mainField2, mainField3, mainField4. - * If omitted on supported displays, the currently set metadata tags will not change. - * If any text field contains no tags or the none tag, the metadata tag for that textfield should be removed. - * @since SmartDeviceLink 2.0 + Text Field Metadata + + App defined metadata information. See MetadataStruct. Uses mainField1, mainField2, mainField3, mainField4. If omitted on supported displays, the currently set metadata tags will not change. If any text field contains no tags or the none tag, the metadata tag for that textfield should be removed. + + @since SmartDeviceLink 2.0 */ @property (strong, nonatomic, nullable) SDLMetadataTags *metadataTags; |