Merge branch 'develop' into feature/issue_1448_generate_deprecated_javadoc

Author: bilal-alsharifi

.github/workflows/android.yml

@@ -28,13 +28,13 @@ jobs:
       run: ./android/gradlew -p ./android/hello_sdl_android test
 
     - name: Sdl JavaSE Tests
-      run: ./javaSE/gradlew -p ./javaSE test
+      run: ./javaSE/gradlew -p ./javaSE/javaSE test
 
     - name: Hello Sdl JavaSE Tests
-      run: ./hello_sdl_java/gradlew -p ./hello_sdl_java test
+      run: ./javaSE/gradlew -p ./javaSE/hello_sdl_java test
 
     - name: Sdl JavaEE Tests
-      run: ./javaEE/gradlew -p ./javaEE test
+      run: ./javaEE/gradlew -p ./javaEE/javaEE test
 
     - name: RPC Generator Tests
       run: |

.gitignore

@@ -1,14 +1,12 @@
 ##############################
 # Project Specific
 ##############################
-javaSE/out/
-javaSE/build/
-javaSE/local.properties
-javaEE/out/
-javaEE/build/
-javaEE/local.properties
-baseAndroid/windows/
-
+javaSE/javaSE/out/
+javaSE/javaSE/build/
+javaSE/javaSE/local.properties
+javaEE/javaEE/out/
+javaEE/javaEE/build/
+javaEE/javaEE/local.properties
 
 ##############################
 # OS generated files 

android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java

@@ -26,12 +26,12 @@
 import com.smartdevicelink.managers.screen.menu.VoiceCommandSelectionListener;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
-import com.smartdevicelink.proxy.TTSChunkFactory;
 import com.smartdevicelink.proxy.rpc.Alert;
 import com.smartdevicelink.proxy.rpc.OnButtonEvent;
 import com.smartdevicelink.proxy.rpc.OnButtonPress;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.Speak;
+import com.smartdevicelink.proxy.rpc.TTSChunk;
 import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
 import com.smartdevicelink.proxy.rpc.enums.ButtonName;
 import com.smartdevicelink.proxy.rpc.enums.FileType;
@@ -40,6 +40,7 @@
 import com.smartdevicelink.proxy.rpc.enums.Language;
 import com.smartdevicelink.proxy.rpc.enums.MenuLayout;
 import com.smartdevicelink.proxy.rpc.enums.PredefinedWindows;
+import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
 import com.smartdevicelink.transport.BaseTransportConfig;
@@ -202,11 +203,6 @@ public void onDestroy() {
 				public void onError(String info, Exception e) {
 				}
 
-				@Override
-				public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language) {
-					return null;
-				}
-
 				@Override
 				public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language, Language hmiLanguage) {
 					boolean isNeedUpdate = false;
@@ -237,7 +233,8 @@ public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language langua
 							break;
 					}
 					if (isNeedUpdate) {
-						return new LifecycleConfigurationUpdate(appName, null, TTSChunkFactory.createSimpleTTSChunks(ttsName), null);
+						Vector<TTSChunk> chunks = new Vector<>(Collections.singletonList(new TTSChunk(ttsName, SpeechCapabilities.TEXT)));
+						return new LifecycleConfigurationUpdate(appName, null, chunks, null);
 					} else {
 						return null;
 					}
@@ -352,7 +349,8 @@ public void onTriggered(TriggerSource trigger) {
 	 * Will speak a sample welcome message
 	 */
 	private void performWelcomeSpeak(){
-		sdlManager.sendRPC(new Speak(TTSChunkFactory.createSimpleTTSChunks(WELCOME_SPEAK)));
+		List<TTSChunk> chunks = Collections.singletonList(new TTSChunk(WELCOME_SPEAK, SpeechCapabilities.TEXT));
+		sdlManager.sendRPC(new Speak(chunks));
 	}
 
 	/**
@@ -414,7 +412,8 @@ private void showTest(){
 		sdlManager.getScreenManager().setTextField2("");
 		sdlManager.getScreenManager().commit(null);
 
-		sdlManager.sendRPC(new Speak(TTSChunkFactory.createSimpleTTSChunks(TEST_COMMAND_NAME)));
+		List<TTSChunk> chunks = Collections.singletonList(new TTSChunk(TEST_COMMAND_NAME, SpeechCapabilities.TEXT));
+		sdlManager.sendRPC(new Speak(chunks));
 	}
 
 	private void showAlert(String text){

android/sdl_android/build.gradle

@@ -35,6 +35,7 @@ android {
 
     sourceSets {
         main.java.srcDirs += '../../base/src/main/java'
+        androidTest.assets.srcDirs += '../../generator/rpc_spec/'
     }
 }
 

android/sdl_android/src/androidTest/assets/json/GetVehicleData.json

@@ -34,7 +34,8 @@
       "electronicParkBrakeStatus":true,
       "gearStatus": true,
       "oemCustomVehicleDataName":true,
-      "windowStatus": true
+      "windowStatus": true,
+      "stabilityControlsStatus": true
     }
   },
   "response":{
@@ -172,6 +173,10 @@
           "range":10.0
         }
       ],
+      "stabilityControlsStatus": {
+        "escSystem": "ON",
+        "trailerSwayControl": "OFF"
+      },
       "oemCustomVehicleDataName":"oemCustomVehicleDataState",
       "gearStatus": {
         "userSelectedGear": "PARK",

android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json

@@ -31,6 +31,7 @@
       "fuelRange":true,
       "turnSignal":true,
       "electronicParkBrakeStatus":true,
+      "stabilityControlsStatus": true,
       "gearStatus": true,
       "oemCustomVehicleDataName":true,
       "windowStatus": true,
@@ -157,6 +158,10 @@
         "dataType":"VEHICLEDATA_HANDSOFFSTEERING",
         "resultCode":"SUCCESS"
       },
+      "stabilityControlsStatus":{
+        "dataType":"VEHICLEDATA_STABILITYCONTROLSSTATUS",
+        "resultCode":"SUCCESS"
+      },
       "gearStatus":{
         "dataType":"VEHICLEDATA_GEARSTATUS",
         "resultCode":"SUCCESS"

android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json

@@ -31,6 +31,7 @@
       "fuelRange":true,
       "turnSignal":true,
       "electronicParkBrakeStatus":true,
+      "stabilityControlsStatus": true,
       "handsOffSteering": true,
       "gearStatus": true,
       "oemCustomVehicleDataName":true,
@@ -161,6 +162,10 @@
         "dataType":"VEHICLEDATA_GEARSTATUS",
         "resultCode":"SUCCESS"
       },
+      "stabilityControlsStatus":{
+        "dataType":"VEHICLEDATA_STABILITYCONTROLSSTATUS",
+        "resultCode":"SUCCESS"
+      },
       "oemCustomVehicleDataName":{
         "oemCustomDataType":"oemCustomVehicleDataName",
         "resultCode":"SUCCESS"