diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-08-17 16:35:42 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-08-17 16:35:42 -0400 |
| commit | 4081edfd518e0f3903af1edd5f74c8a5de2d50d3 (patch) | |
| tree | 53b0f3473be0af4690d66b508aa4116c24cb7596 /base/src/main/java/com/smartdevicelink/proxy/rpc/enums | |
| parent | d9aac82aa1a8626c32bd3cd09df49b0b878e8d66 (diff) | |
| parent | c92ff5dbd99ff663c4a81ab95868bc8967ee7842 (diff) | |
| download | sdl_android-4081edfd518e0f3903af1edd5f74c8a5de2d50d3.tar.gz | |
Merge branch 'develop' into feature/issue_1446_remove_deprecated_rpcsfeature/issue_1446_remove_deprecated_rpcs
# Conflicts:
# base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
Diffstat (limited to 'base/src/main/java/com/smartdevicelink/proxy/rpc/enums')
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java index cc5572ef2..cb595fc9d 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java @@ -114,7 +114,13 @@ public enum ImageFieldName { *
* @since SmartDeviceLink 7.0.0
*/
- subtleAlertIcon
+ subtleAlertIcon,
+ /**
+ * The image field for AddSubMenu.menuIcon
+ *
+ * @since SmartDeviceLink 7.0.0
+ */
+ subMenuIcon
;
/**
|