Skip to content

Commit 925d9c5

Browse files
author
Robert Henigan
authored
Merge pull request #1505 from smartdevicelink/feature/code_formatting
Reformat project code
2 parents c003e10 + 9bf45a7 commit 925d9c5

1,102 files changed

Lines changed: 78856 additions & 76731 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎android/sdl_android/bintray.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ bintray {
6666
version {
6767
name = libVersion // Change to release version
6868
desc = libDescription
69-
released = new Date() // Will be the current date & time
69+
released = new Date() // Will be the current date & time
7070
vcsTag = libVersion // Should match git tag
7171
}
7272
}

‎android/sdl_android/src/androidTest/AndroidManifest.xml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
<manifest package="com.smartdevicelink" xmlns:android="http://schemas.android.com/apk/res/android">
2-
<uses-sdk android:minSdkVersion="16"/>
3-
<uses-permission android:name="android.permission.BLUETOOTH" />
1+
<manifest package="com.smartdevicelink"
2+
xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<uses-sdk android:minSdkVersion="16" />
5+
<uses-permission android:name="android.permission.BLUETOOTH" />
46
<!-- Required to pair Bluetooth devices -->
57
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
68
<uses-permission android:name="android.permission.INTERNET" />
79
<!-- Required to check if WiFi is enabled -->
810
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
9-
11+
1012
<instrumentation
11-
android:name="android.test.InstrumentationTestRunner"
12-
android:targetPackage="com.smartdevicelink.test" />
13-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
14-
13+
android:name="android.test.InstrumentationTestRunner"
14+
android:targetPackage="com.smartdevicelink.test" />
15+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
16+
1517
<application android:debuggable="true">
1618
<uses-library android:name="android.test.runner" />
1719
</application>

‎android/sdl_android/src/androidTest/assets/json/AddCommand.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2-
"request":{
3-
"name":"AddCommand",
4-
"correlationID":105,
5-
"parameters":{
6-
"cmdID":1098,
7-
"vrCommands":[
2+
"request": {
3+
"name": "AddCommand",
4+
"correlationID": 105,
5+
"parameters": {
6+
"cmdID": 1098,
7+
"vrCommands": [
88
"vr1",
99
"vr2",
1010
"vr3"
1111
],
12-
"cmdIcon":{
13-
"value":"cmdImage1.png",
14-
"imageType":"DYNAMIC"
12+
"cmdIcon": {
13+
"value": "cmdImage1.png",
14+
"imageType": "DYNAMIC"
1515
},
16-
"menuParams":{
17-
"parentID":194,
18-
"position":1,
19-
"menuName":"My Command"
16+
"menuParams": {
17+
"parentID": 194,
18+
"position": 1,
19+
"menuName": "My Command"
2020
}
2121
}
2222
},
23-
"response":{
24-
"name":"AddCommandResponse",
25-
"correlationID":106
23+
"response": {
24+
"name": "AddCommandResponse",
25+
"correlationID": 106
2626
}
2727
}

‎android/sdl_android/src/androidTest/assets/json/AddSubMenu.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"request":{
3-
"name":"AddSubMenu",
4-
"correlationID":107,
5-
"parameters":{
6-
"menuID":765,
7-
"position":2,
8-
"menuName":"Menu Name",
9-
"menuIcon":{
10-
"value":"cmdImage1.png",
11-
"imageType":"DYNAMIC"
12-
}
2+
"request": {
3+
"name": "AddSubMenu",
4+
"correlationID": 107,
5+
"parameters": {
6+
"menuID": 765,
7+
"position": 2,
8+
"menuName": "Menu Name",
9+
"menuIcon": {
10+
"value": "cmdImage1.png",
11+
"imageType": "DYNAMIC"
12+
}
1313
}
14-
},
15-
"response":{
16-
"name":"AddSubMenuResponse",
17-
"correlationID":108
18-
}
14+
},
15+
"response": {
16+
"name": "AddSubMenuResponse",
17+
"correlationID": 108
18+
}
1919
}

‎android/sdl_android/src/androidTest/assets/json/Alert.json‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
{
2-
"request":{
3-
"name":"Alert",
4-
"correlationID":109,
5-
"parameters":{
6-
"playTone":true,
7-
"duration":500,
8-
"alertText1":"Line 1",
9-
"alertText2":"Line 2",
10-
"alertText3":"Line 3",
11-
"progressIndicator":true,
12-
"cancelID":45,
13-
"alertIcon":{
14-
"value":"alertIconImage1.png",
15-
"imageType":"DYNAMIC"
16-
},
17-
"ttsChunks":[
18-
{
19-
"text":"Phrase 1",
20-
"type":"TEXT"
21-
},
22-
{
23-
"text":"Phrase 2",
24-
"type":"TEXT"
25-
}
26-
],
27-
"softButtons":[
28-
{
29-
"isHighlighted":true,
30-
"softButtonID":6,
31-
"systemAction":"STEAL_FOCUS",
32-
"text":"Button 1",
33-
"type":"IMAGE",
34-
"image":{
35-
"value":"image.png",
36-
"imageType":"STATIC"
37-
}
38-
},
39-
{
40-
"isHighlighted":false,
41-
"softButtonID":3,
42-
"systemAction":"DEFAULT_ACTION",
43-
"text":"Button 2",
44-
"type":"BOTH",
45-
"image":{
46-
"value":"image.png",
47-
"imageType":"DYNAMIC"
48-
}
49-
}
50-
]
51-
}
52-
},
53-
"response":{
54-
"name":"AlertResponse",
55-
"correlationID":110,
56-
"parameters":{
57-
"tryAgainTime":400
58-
}
59-
}
2+
"request": {
3+
"name": "Alert",
4+
"correlationID": 109,
5+
"parameters": {
6+
"playTone": true,
7+
"duration": 500,
8+
"alertText1": "Line 1",
9+
"alertText2": "Line 2",
10+
"alertText3": "Line 3",
11+
"progressIndicator": true,
12+
"cancelID": 45,
13+
"alertIcon": {
14+
"value": "alertIconImage1.png",
15+
"imageType": "DYNAMIC"
16+
},
17+
"ttsChunks": [
18+
{
19+
"text": "Phrase 1",
20+
"type": "TEXT"
21+
},
22+
{
23+
"text": "Phrase 2",
24+
"type": "TEXT"
25+
}
26+
],
27+
"softButtons": [
28+
{
29+
"isHighlighted": true,
30+
"softButtonID": 6,
31+
"systemAction": "STEAL_FOCUS",
32+
"text": "Button 1",
33+
"type": "IMAGE",
34+
"image": {
35+
"value": "image.png",
36+
"imageType": "STATIC"
37+
}
38+
},
39+
{
40+
"isHighlighted": false,
41+
"softButtonID": 3,
42+
"systemAction": "DEFAULT_ACTION",
43+
"text": "Button 2",
44+
"type": "BOTH",
45+
"image": {
46+
"value": "image.png",
47+
"imageType": "DYNAMIC"
48+
}
49+
}
50+
]
51+
}
52+
},
53+
"response": {
54+
"name": "AlertResponse",
55+
"correlationID": 110,
56+
"parameters": {
57+
"tryAgainTime": 400
58+
}
59+
}
6060
}

‎android/sdl_android/src/androidTest/assets/json/AlertManeuver.json‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
{
2-
"request":{
3-
"name":"AlertManeuver",
4-
"correlationID":194,
5-
"parameters":{
6-
"ttsChunks":[
2+
"request": {
3+
"name": "AlertManeuver",
4+
"correlationID": 194,
5+
"parameters": {
6+
"ttsChunks": [
77
{
8-
"text":"Phrase 1",
9-
"type":"TEXT"
8+
"text": "Phrase 1",
9+
"type": "TEXT"
1010
},
1111
{
12-
"text":"Phrase 2",
13-
"type":"TEXT"
12+
"text": "Phrase 2",
13+
"type": "TEXT"
1414
}
1515
],
16-
"softButtons":[
16+
"softButtons": [
1717
{
18-
"isHighlighted":true,
19-
"softButtonID":6,
20-
"systemAction":"STEAL_FOCUS",
21-
"text":"Button 1",
22-
"type":"IMAGE",
23-
"image":{
24-
"value":"image.png",
25-
"imageType":"STATIC"
18+
"isHighlighted": true,
19+
"softButtonID": 6,
20+
"systemAction": "STEAL_FOCUS",
21+
"text": "Button 1",
22+
"type": "IMAGE",
23+
"image": {
24+
"value": "image.png",
25+
"imageType": "STATIC"
2626
}
2727
},
2828
{
29-
"isHighlighted":false,
30-
"softButtonID":3,
31-
"systemAction":"DEFAULT_ACTION",
32-
"text":"Button 2",
33-
"type":"BOTH",
34-
"image":{
35-
"value":"image.png",
36-
"imageType":"DYNAMIC"
29+
"isHighlighted": false,
30+
"softButtonID": 3,
31+
"systemAction": "DEFAULT_ACTION",
32+
"text": "Button 2",
33+
"type": "BOTH",
34+
"image": {
35+
"value": "image.png",
36+
"imageType": "DYNAMIC"
3737
}
3838
}
3939
]
4040
}
4141
},
42-
"response":{
43-
"name":"AlertManeuverResponse",
44-
"correlationID":195
42+
"response": {
43+
"name": "AlertManeuverResponse",
44+
"correlationID": 195
4545
}
4646
}

‎android/sdl_android/src/androidTest/assets/json/ButtonPress.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"request":{
3-
"name":"ButtonPress",
4-
"correlationID":215,
5-
"parameters":{
6-
"buttonName":"OK",
7-
"buttonPressMode":"LONG",
8-
"moduleType":"CLIMATE"
2+
"request": {
3+
"name": "ButtonPress",
4+
"correlationID": 215,
5+
"parameters": {
6+
"buttonName": "OK",
7+
"buttonPressMode": "LONG",
8+
"moduleType": "CLIMATE"
99
}
1010
},
11-
"response":{
12-
"name":"ButtonPressResponse",
13-
"correlationID":216
11+
"response": {
12+
"name": "ButtonPressResponse",
13+
"correlationID": 216
1414
}
1515
}

‎android/sdl_android/src/androidTest/assets/json/CancelInteraction.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"request":{
3-
"name":"CancelInteraction",
4-
"correlationID":554,
5-
"parameters":{
6-
"cancelID":6052,
7-
"functionID":12
2+
"request": {
3+
"name": "CancelInteraction",
4+
"correlationID": 554,
5+
"parameters": {
6+
"cancelID": 6052,
7+
"functionID": 12
88
}
99
},
10-
"response":{
11-
"name":"CancelInteractionResponse",
12-
"correlationID":554
10+
"response": {
11+
"name": "CancelInteractionResponse",
12+
"correlationID": 554
1313
}
1414
}

‎android/sdl_android/src/androidTest/assets/json/ChangeRegistration.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"request":{
3-
"name":"ChangeRegistration",
4-
"correlationID":111,
5-
"parameters":{
6-
"language":"ES-ES",
7-
"hmiDisplayLanguage":"EN-US"
2+
"request": {
3+
"name": "ChangeRegistration",
4+
"correlationID": 111,
5+
"parameters": {
6+
"language": "ES-ES",
7+
"hmiDisplayLanguage": "EN-US"
88
}
99
},
10-
"response":{
11-
"name":"ChangeRegistrationResponse",
12-
"correlationID":112
10+
"response": {
11+
"name": "ChangeRegistrationResponse",
12+
"correlationID": 112
1313
}
1414
}

0 commit comments

Comments
 (0)