Skip to content

Commit ff103a8

Browse files
committed
Revert some excessive formatting changes
1 parent 1683adc commit ff103a8

52 files changed

Lines changed: 210 additions & 249 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/src/androidTest/java/com/android/grafika/gles/OffscreenSurfaceTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
import android.opengl.GLES20;
44
import android.os.Environment;
5-
65
import androidx.test.ext.junit.runners.AndroidJUnit4;
7-
86
import android.util.Log;
97

108
import org.junit.Test;

android/sdl_android/src/androidTest/java/com/smartdevicelink/AlertViewTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.smartdevicelink.managers.screen.SoftButtonObject;
99
import com.smartdevicelink.managers.screen.SoftButtonState;
1010
import com.smartdevicelink.proxy.rpc.enums.FileType;
11-
1211
import static junit.framework.TestCase.assertEquals;
1312
import static junit.framework.TestCase.assertTrue;
1413

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/AlertAudioDataTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22

33
import android.content.Context;
44
import android.net.Uri;
5-
65
import androidx.test.ext.junit.runners.AndroidJUnit4;
76

87
import com.smartdevicelink.managers.file.filetypes.SdlFile;
98
import com.smartdevicelink.proxy.rpc.enums.FileType;
109
import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
11-
1210
import org.junit.Before;
1311
import org.junit.Test;
1412
import org.junit.runner.RunWith;
15-
1613
import java.util.Collections;
1714

1815
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/PresentAlertOperationTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ public Void answer(InvocationOnMock invocation) {
108108
};
109109

110110
Task task;
111-
112111
@Before
113112
public void setUp() throws Exception {
114113
Context mTestContext = getInstrumentation().getContext();

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ public void testSettingSoftButtonId() {
209209
SoftButtonObject softButtonObject3 = new SoftButtonObject("object1", Arrays.asList(softButtonState1, softButtonState2), softButtonState1.getName(), null);
210210
SoftButtonObject softButtonObject4 = new SoftButtonObject("object2", Arrays.asList(softButtonState3, softButtonState4), softButtonState3.getName(), null);
211211
assertTrue(screenManager.checkAndAssignButtonIds(softButtonObjects, BaseScreenManager.ManagerLocation.SOFTBUTTON_MANAGER));
212-
213-
214212
}
215213

216214
@Test

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
*/
3535

3636
package com.smartdevicelink.managers.screen.choiceset;
37-
3837
import androidx.test.ext.junit.runners.AndroidJUnit4;
3938

4039
import com.livio.taskmaster.Taskmaster;

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperationTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,11 @@ public void testResendingSameCellWithDifferentListener() {
178178

179179
final MenuSelectionListener listener1 = new MenuSelectionListener() {
180180
@Override
181-
public void onTriggered(TriggerSource trigger) {
182-
}
181+
public void onTriggered(TriggerSource trigger) {}
183182
};
184183
final MenuSelectionListener listener2 = new MenuSelectionListener() {
185184
@Override
186-
public void onTriggered(TriggerSource trigger) {
187-
}
185+
public void onTriggered(TriggerSource trigger) {}
188186
};
189187
final MenuCell menuCell1 = new MenuCell("A", null, null, null, null, null, listener1);
190188
final MenuCell menuCell2 = new MenuCell("A", null, null, null, null, null, listener2);

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilitiesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void testAddMenuRequestWithCommandId() {
199199
assertEquals(2, actualMenuCellList.get(4).getSubCells().size());
200200
assertEquals(1, actualMenuCellList.get(4).getSubCells().get(0).getSubCells().size());
201201
assertEquals(0, actualMenuCellList.get(4).getSubCells().get(1).getSubCells().size());
202-
202+
203203
// Add cell c5-2-1
204204
menuCellToAdd = newMenuList.get(0).getSubCells().get(1).getSubCells().get(0);
205205
cellAdded = MenuReplaceUtilities.addCellWithCellId(menuCellToAdd.getCellId(), 0, newMenuList, actualMenuCellList);

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,7 @@ public boolean isClickable() {
234234

235235
final ViewGroup parent1 = new ViewGroup(context) {
236236
@Override
237-
protected void onLayout(boolean b, int i, int i1, int i2, int i3) {
238-
}
237+
protected void onLayout(boolean b, int i, int i1, int i2, int i3) {}
239238

240239
@Override
241240
public View getChildAt(int index) {
@@ -250,8 +249,7 @@ public int getChildCount() {
250249

251250
final ViewGroup parent2 = new ViewGroup(context) {
252251
@Override
253-
protected void onLayout(boolean b, int i, int i1, int i2, int i3) {
254-
}
252+
protected void onLayout(boolean b, int i, int i1, int i2, int i3) {}
255253

256254
@Override
257255
public View getChildAt(int index) {

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -318,17 +318,13 @@ public void onComplete(boolean success) {
318318
try {
319319
sdlRemoteDisplayField =
320320
VideoStreamManager.class.getDeclaredField("sdlRemoteDisplay");
321-
} catch (NoSuchFieldException e) {
322-
e.printStackTrace();
323-
}
321+
} catch (NoSuchFieldException e) { e.printStackTrace(); }
324322
sdlRemoteDisplayField.setAccessible(true);
325323

326324
SdlRemoteDisplay display = null;
327325
try {
328326
display = (SdlRemoteDisplay) sdlRemoteDisplayField.get(videoStreamManager);
329-
} catch (IllegalAccessException e) {
330-
e.printStackTrace();
331-
}
327+
} catch (IllegalAccessException e) { e.printStackTrace(); }
332328
display.onViewResized(100, 100);
333329

334330
assertTrue(viewResizedCalled);

0 commit comments

Comments
 (0)