diff options
| author | Brett <3911458+BrettyWhite@users.noreply.github.com> | 2019-10-15 10:01:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 10:01:34 -0400 |
| commit | feedc0cb4eda5fd2847b133398ab143a40016731 (patch) | |
| tree | d7961732f9c813b6027be8a22a8503881e2947b7 | |
| parent | 81eb1a0311653c28de8bcdfdd00dfc953402fbca (diff) | |
| parent | e6e3ec341b3e36de1ca019dd89b28a532af70bd5 (diff) | |
| download | sdl_android-feedc0cb4eda5fd2847b133398ab143a40016731.tar.gz | |
Merge pull request #1200 from smartdevicelink/feature/rename_get_title
Rename getTemplateTitle() to getTitle()
2 files changed, 3 insertions, 3 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java index 4ab1fe7f7..34cebfc08 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java @@ -45,7 +45,7 @@ public class ScreenManagerTests extends AndroidTestCase2 { assertNull(screenManager.getTextField2()); assertNull(screenManager.getTextField3()); assertNull(screenManager.getTextField4()); - assertNull(screenManager.getTemplateTitle()); + assertNull(screenManager.getTitle()); assertNull(screenManager.getMediaTrackTextField()); assertNull(screenManager.getPrimaryGraphic()); assertNull(screenManager.getSecondaryGraphic()); @@ -74,7 +74,7 @@ public class ScreenManagerTests extends AndroidTestCase2 { assertEquals(screenManager.getTextField2(), "Wednesday"); assertEquals(screenManager.getTextField3(), "My"); assertEquals(screenManager.getTextField4(), "Dudes"); - assertEquals(screenManager.getTemplateTitle(), "title"); + assertEquals(screenManager.getTitle(), "title"); } public void testMediaTrackTextFields() { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java index 95f5d5732..82e4c4131 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java @@ -356,7 +356,7 @@ abstract class BaseScreenManager extends BaseSubManager { * Gets the title of the new template that will be displayed * @return title - String value that represents the title of the new template that will be displayed */ - public String getTemplateTitle(){ + public String getTitle(){ return this.textAndGraphicManager.getTitle(); } |