Merge branch 'develop_mainRepo' into rpcMsgProtection2

* develop_mainRepo: (262 commits)
  Fix error on FunctionID
  Update predefined window to be a enum Update the validations for the ONHMIStatus Update tests
  Change to int enum
  Validation of the manager on the onHMIStatus
  change to set it as Object as suggested
  Update checkLifecycleConfiguration logic
  fix failing tests
  removed more references to 'default'
  fix improper tab
  dont require Menu config params and remove defaults
  add some javadocs for migrating to newer SDL Versions
  fix tabulation and position
  change back to previous way
  revert last commit
  Add javadoc for scale, ppi and diagonalscreensize
  Dont allow user to modify scale value
  Call sendRPC method
  Fix documentation Fix indentation for
  Convert odd resolution to pair resolution.
  Deprecate old proxy classes
  ...

7 files changed, 388 insertions, 96 deletions

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
index 75c1e9461..d58a048a5 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.proxy.rpc.enums;

 

 /**

@@ -188,6 +188,102 @@ public enum ButtonName{
 	 * @see #OK

 	 */

 	PLAY_PAUSE,

+	/**

+	 * Represents the center location button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_CENTER_LOCATION,

+	/**

+	 * Represents the the zoom in button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_ZOOM_IN,

+	/**

+	 * Represents the zoom out button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_ZOOM_OUT,

+	/**

+	 * Represents the pan up button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_PAN_UP,

+	/**

+	 * Represents the pan up-right button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_PAN_UP_RIGHT,

+	/**

+	 * Represents the pan right button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_PAN_RIGHT,

+	/**

+	 * Represents the pan down-right button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_PAN_DOWN_RIGHT,

+	/**

+	 * Represents the pan down button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_PAN_DOWN,

+	/**

+	 * Represents the pan down-left button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_PAN_DOWN_LEFT,

+	/**

+	 * Represents the pan left button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_PAN_LEFT,

+	/**

+	 * Represents the pan up-left button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_PAN_UP_LEFT,

+	/**

+	 * Represents the title toggle button

+	 * If supported, this toggles between a top-down view and an angled/3D view.

+	 * If your app supports different, but substantially similar options, then you may implement those.

+	 * If you don't implement these or similar options, do not subscribe to this button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_TILT_TOGGLE,

+	/**

+	 * Represents the rotate clockwise button

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_ROTATE_CLOCKWISE,

+	/**

+	 * Represents the rotate counterclockwise button

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_ROTATE_COUNTERCLOCKWISE,

+	/**

+	 * Represents the heading toggle button

+	 * If supported, this toggles between locking the orientation to north or to the vehicle's heading.

+	 * If your app supports different, but substantially similar options, then you may implement those.

+	 * If you don't implement these or similar options, do not subscribe to this button.

+	 *

+	 * @since SmartDeviceLink 6.0

+	 */

+	NAV_HEADING_TOGGLE

 

 	;

 

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 c88591a23..9c7aa2722 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
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.proxy.rpc.enums;

 /**

  * The name that identifies the field.

@@ -103,6 +103,12 @@ public enum ImageFieldName {
 	 * @since SmartDeviceLink 5.0

 	 */

 	secondaryGraphic,

+	/**

+	 * The image field for Alert

+	 *

+	 * @since SmartDeviceLink 6.0.0

+	 */

+	alertIcon,

 	;

     

 	/**

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MenuLayout.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MenuLayout.java
new file mode 100644
index 000000000..fcda7b498
--- /dev/null
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MenuLayout.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c)  2019 Livio, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Livio Inc. nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Created by brettywhite on 7/17/19 12:00 PM
+ *
+ */
+
+package com.smartdevicelink.proxy.rpc.enums;
+
+/**
+ * How the main menu or submenu is laid out on screen
+ */
+public enum MenuLayout {
+
+	LIST,
+
+	TILES,
+
+	;
+
+	public static MenuLayout valueForString(String value) {
+		try {
+			return valueOf(value);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedWindows.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedWindows.java
new file mode 100644
index 000000000..35b8833c0
--- /dev/null
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedWindows.java
@@ -0,0 +1,52 @@
+package com.smartdevicelink.proxy.rpc.enums;

+

+import java.util.EnumSet;

+

+/**

+ * specifies what windows and IDs are predefined and pre-created on behalf of the app.

+ *

+ * The default window is always available and represents the app window on the main display.

+ * It's an equivalent to today's app window.

+ * For backward compatibility, this will ensure the app always has at least the default window on the main display.

+ * The app can choose to use this predefined enum element to specifically address app's main window or to duplicate window content.

+ * It is not possible to duplicate another window to the default window.

+ *

+ * The primary widget is a special widget, that can be associated with a service type, which is used by the HMI whenever a single widget needs to represent the whole app.

+ * The primary widget should be named as the app and can be pre-created by the HMI

+ * @since 6.0

+ */

+public enum PredefinedWindows {

+    /**

+     * The default window is a main window pre-created on behalf of the app.

+     */

+    DEFAULT_WINDOW (0),

+    /**

+     * The primary widget of the app.

+     */

+    PRIMARY_WIDGET (1),

+

+    ;

+

+

+    final int VALUE;

+    /**

+     * Private constructor

+     */

+    PredefinedWindows (int value) {

+        this.VALUE = value;

+    }

+

+    public static PredefinedWindows valueForInt(int value) {

+

+        for (PredefinedWindows anEnum : EnumSet.allOf(PredefinedWindows.class)) {

+            if (anEnum.getValue() == value) {

+                return anEnum;

+            }

+        }

+        return null;

+    }

+

+    public int getValue(){

+        return VALUE;

+    }

+}

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
index 69ead0602..900578400 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
@@ -277,11 +277,56 @@ public enum SystemCapabilityType {
 	 * 			<td>DisplayCapabilities</td>
 	 * 			<td>Returns Display Capabilities</td>
 	 * 			<td align=center>N</td>
+	 * 			<td> Available Synchronously <strong>after</strong> Register App Interface response received</td>
+	 * 		</tr>
+	 * 	</table>
+	 */
+	DISPLAY (false),
+
+
+	/**
+	 * @since 6.0
+	 * Returns: List<DisplayCapability>
+	 * <table border="1" rules="all">
+	 * 		<tr>
+	 * 			<th>Enum Name</th>
+	 * 			<th>Return Type</th>
+	 * 			<th>Description</th>
+	 * 			<th>Requires Async?</th>
+	 * 			<th>Notes</th>
+	 * 		</tr>
+	 * 		<tr>
+	 * 			<td>DISPLAYS</td>
+	 * 			<td>List<DisplayCapability></td>
+	 * 			<td>Returns a list of Display Capability</td>
+	 * 			<td align=center>Y</td>
+	 * 			<td> <strong>Since 6.0</strong> Contain the display related information and all windows related to that display.</td>
+	 * 		</tr>
+	 * 	</table>
+	 */
+	DISPLAYS (true),
+
+	/**
+	 * Available Synchronously after Register App Interface response <br>
+	 * Returns: List<PrerecordedSpeech>
+	 * <table border="1" rules="all">
+	 * 		<tr>
+	 * 			<th>Enum Name</th>
+	 * 			<th>Return Type</th>
+	 * 			<th>Description</th>
+	 * 			<th>Requires Async?</th>
+	 * 			<th>Notes</th>
+	 * 		</tr>
+	 * 		<tr>
+	 * 			<td>PRERECORDED_SPEECH</td>
+	 * 			<td>prerecordedSpeechCapabilities</td>
+	 * 			<td>Returns List<PrerecordedSpeech></td>
+	 * 			<td align=center>N</td>
 	 * 			<td>Available Synchronously <strong>after</strong> Register App Interface response received</td>
 	 * 		</tr>
 	 * 	</table>
 	 */
-    DISPLAY (false),
+	PRERECORDED_SPEECH (false),
 
 	/**
 	 * Available Synchronously after Register App Interface response <br>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
index f7258b933..a8fe4bd38 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.proxy.rpc.enums;

 /** Names of the text fields that can appear on the display. 

  * 

@@ -154,7 +154,7 @@ public enum TextFieldName {
     tertiaryText,

 	/** Optional text to label an app menu button (for certain touchscreen platforms).

 	 * 

-	 */
+	 */

     menuTitle,

     /**

      * Optional name / title of intended location for SendLocation.

@@ -175,11 +175,17 @@ public enum TextFieldName {
      */

     addressLines,

     /**

-     * Optional hone number of intended location / establishment (if applicable) for SendLocation.

+     * Optional phone number of intended location / establishment (if applicable) for SendLocation.

      * 

      * @since SmartDeviceLink 4.0

      */

     phoneNumber,

+    /**

+     * Optional title of the template that will be displayed

+     *

+     * @since SmartDeviceLink 6.0

+     */

+    templateTitle,

     ;

 	  /**

        * Convert String to TextFieldName

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WindowType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WindowType.java
new file mode 100644
index 000000000..754b0433c
--- /dev/null
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WindowType.java
@@ -0,0 +1,30 @@
+package com.smartdevicelink.proxy.rpc.enums;

+

+/**

+ * The type of the window to be created. Main window or widget.

+ * @since 6.0

+ */

+public enum WindowType {

+    /**

+     * This window type describes the main window on a display.

+     */

+    MAIN,

+    /**

+     * A widget is a small window that the app can create to provide information and soft buttons for quick app control.

+     */

+    WIDGET;

+

+    /**

+     * Convert String to WindowType

+     *

+     * @param value String

+     * @return WindowType

+     */

+    public static WindowType valueForString(String value) {

+        try {

+            return valueOf(value);

+        } catch (Exception e) {

+            return null;

+        }

+    }

+}