diff options
| author | BrettyWhite <geekman3454@protonmail.com> | 2019-08-09 13:32:13 -0400 |
|---|---|---|
| committer | BrettyWhite <geekman3454@protonmail.com> | 2019-08-09 13:32:13 -0400 |
| commit | 7cb62fc0a73045b7c991c15bb8d2ba5d96659779 (patch) | |
| tree | 4502ce0282d2272b81e5c17cdd24fbc1b5def415 | |
| parent | 2d4a7934509714e0a65faa432d6a2b2f637124d0 (diff) | |
| download | sdl_android-feature/lockscreen_optional.tar.gz | |
improving readability of the lockscreen managerfeature/lockscreen_optional
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java index 000ce4388..8706a8f0f 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java @@ -275,14 +275,15 @@ public class LockScreenManager extends BaseSubManager { // intent to open SDLLockScreenActivity // pass in icon, background color, and custom view if (lockScreenEnabled && isApplicationForegrounded && context.get() != null) { + if (mIsLockscreenDismissible) { context.get().registerReceiver(mLockscreenDismissedReceiver, new IntentFilter(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED)); } + LockScreenStatus status = getLockScreenStatus(); if (status == LockScreenStatus.REQUIRED || (showInOptionalState && status == LockScreenStatus.OPTIONAL)) { Intent showLockScreenIntent = new Intent(context.get(), SDLLockScreenActivity.class); showLockScreenIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - // Extra parameters for customization of the lock screen view showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_ICON_EXTRA, lockScreenIcon); showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_COLOR_EXTRA, lockScreenColor); @@ -320,7 +321,7 @@ public class LockScreenManager extends BaseSubManager { */ synchronized LockScreenStatus getLockScreenStatus() { - if ( (hmiLevel == null) || (hmiLevel.equals(HMILevel.HMI_NONE))) { + if ((hmiLevel == null) || (hmiLevel.equals(HMILevel.HMI_NONE))) { return LockScreenStatus.OFF; } else if ( hmiLevel.equals(HMILevel.HMI_BACKGROUND)) { @@ -331,7 +332,7 @@ public class LockScreenManager extends BaseSubManager { return LockScreenStatus.REQUIRED; } } - else if ( (hmiLevel.equals(HMILevel.HMI_FULL)) || (hmiLevel.equals(HMILevel.HMI_LIMITED))) { + else if ((hmiLevel.equals(HMILevel.HMI_FULL)) || (hmiLevel.equals(HMILevel.HMI_LIMITED))) { if (!driverDistStatus) { return LockScreenStatus.OPTIONAL; } else { @@ -364,5 +365,4 @@ public class LockScreenManager extends BaseSubManager { } }).start(); } - } |