diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2020-10-26 09:25:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-26 09:25:26 -0400 |
commit | 359f1b4eee404ce7a0f393c75fe1498ec728d5bd (patch) | |
tree | 4a6eedc41199629cedabb873e81a40d1277ed16f | |
parent | 958ae890ae8edaabe7a9acc110642996055cf369 (diff) | |
parent | 3cefe68fb7e42aafc5764bc20773906d6d604d99 (diff) | |
download | sdl_ios-359f1b4eee404ce7a0f393c75fe1498ec728d5bd.tar.gz |
Merge pull request #1818 from smartdevicelink/bugfix/issue-1782-example-app-soft-button-reset
Fix example apps resetting the soft button state when going from HMI BACKGROUND -> FULL
-rw-r--r-- | Example Apps/Example ObjC/ProxyManager.m | 4 | ||||
-rw-r--r-- | Example Apps/Example Swift/ProxyManager.swift | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Example Apps/Example ObjC/ProxyManager.m b/Example Apps/Example ObjC/ProxyManager.m index 63650372b..ed2c057e3 100644 --- a/Example Apps/Example ObjC/ProxyManager.m +++ b/Example Apps/Example ObjC/ProxyManager.m @@ -169,7 +169,6 @@ NS_ASSUME_NONNULL_BEGIN [self.sdlManager.screenManager changeLayout:[[SDLTemplateConfiguration alloc] initWithPredefinedLayout:SDLPredefinedLayoutNonMedia] withCompletionHandler:nil]; [self sdlex_updateScreen]; - self.sdlManager.screenManager.softButtonObjects = [self.buttonManager allScreenSoftButtons]; } - (nullable RefreshUIHandler)refreshUIHandler { @@ -244,8 +243,9 @@ NS_ASSUME_NONNULL_BEGIN // This is our first time in a non-NONE state self.firstHMILevel = newLevel; - // Send static menu items. + // Send static menu items and soft buttons [self sdlex_createMenus]; + self.sdlManager.screenManager.softButtonObjects = [self.buttonManager allScreenSoftButtons]; // Subscribe to vehicle data. [self.vehicleDataManager subscribeToVehicleOdometer]; diff --git a/Example Apps/Example Swift/ProxyManager.swift b/Example Apps/Example Swift/ProxyManager.swift index b0a93edda..bce2617ad 100644 --- a/Example Apps/Example Swift/ProxyManager.swift +++ b/Example Apps/Example Swift/ProxyManager.swift @@ -165,8 +165,9 @@ extension ProxyManager: SDLManagerDelegate { // This is our first time in a non-NONE state firstHMILevelState = newLevel - // Send static menu items. + // Send static menu items and soft buttons createMenuAndGlobalVoiceCommands() + sdlManager.screenManager.softButtonObjects = buttonManager.allScreenSoftButtons() // Subscribe to vehicle data. vehicleDataManager.subscribeToVehicleOdometer() @@ -254,7 +255,6 @@ private extension ProxyManager { sdlManager.screenManager.changeLayout(SDLTemplateConfiguration(predefinedLayout: .nonMedia), withCompletionHandler: nil) updateScreen() - sdlManager.screenManager.softButtonObjects = buttonManager.allScreenSoftButtons() } /// Update the UI's textfields, images and soft buttons |