Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LockScreen Changes #1153

Merged
merged 6 commits into from
Aug 28, 2019
Merged

LockScreen Changes #1153

merged 6 commits into from
Aug 28, 2019

Conversation

BrettyWhite
Copy link
Contributor

Fixes #934

This PR is ready for review.

Risk

This PR makes minor API changes.

Testing Plan

Smoke tests and Unit tests

Summary

Add in a new IntDef Enum for lock screen DisplayModes, add in the ability to not allow lock screen dismissal

CLA

@BrettyWhite BrettyWhite added the proposal Accepted SDL Evolution Proposal label Aug 20, 2019
@BrettyWhite BrettyWhite self-assigned this Aug 20, 2019
@codecov-io
Copy link

codecov-io commented Aug 20, 2019

Codecov Report

Merging #1153 into develop will decrease coverage by 2.23%.
The diff coverage is 44.44%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1153      +/-   ##
=============================================
- Coverage       46.8%   44.56%   -2.24%     
- Complexity      4070     4439     +369     
=============================================
  Files            459      470      +11     
  Lines          22458    26562    +4104     
  Branches        2553     3611    +1058     
=============================================
+ Hits           10512    11838    +1326     
- Misses         11318    13970    +2652     
- Partials         628      754     +126
Impacted Files Coverage Δ Complexity Δ
...ink/managers/lockscreen/SDLLockScreenActivity.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...icelink/managers/lockscreen/LockScreenManager.java 42.99% <40%> (+14.52%) 18 <7> (+13) ⬆️
...vicelink/managers/lockscreen/LockScreenConfig.java 92.59% <75%> (-7.41%) 14 <3> (+3)
...com/smartdevicelink/proxy/rpc/ImageResolution.java 75% <0%> (-11.67%) 12% <0%> (+5%)
.../managers/screen/menu/BaseVoiceCommandManager.java 53.1% <0%> (-3.2%) 19% <0%> (+3%)
...om/smartdevicelink/transport/SdlRouterService.java 11.59% <0%> (-0.24%) 20% <0%> (ø)
...smartdevicelink/haptic/HapticInterfaceManager.java 0% <0%> (ø) 0% <0%> (ø) ⬇️
...om/smartdevicelink/proxy/rpc/SetDisplayLayout.java 100% <0%> (ø) 17% <0%> (+8%) ⬆️
...artdevicelink/transport/MultiplexTcpTransport.java 0% <0%> (ø) 0% <0%> (ø) ⬇️
.../main/java/com/smartdevicelink/proxy/rpc/Show.java 100% <0%> (ø) 63% <0%> (+33%) ⬆️
... and 34 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 090248f...15db33d. Read the comment docs.

*
* <li> displayMode - Describes when the lock screen will be displayed. Defaults to `DISPLAY_MODE_REQUIRED_ONLY`.</li>
*
* <li> enableDismissGesture - If YES, then the lock screen can be dismissed with a downward swipe on compatible head units.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we replace YES with true in the javadoc in this file?

@@ -279,7 +283,7 @@ private void launchLockScreenActivity(){
context.get().registerReceiver(mLockscreenDismissedReceiver, new IntentFilter(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldnt that potentially register the receiver multiple times?

@@ -99,6 +97,14 @@ public LockScreenManager(LockScreenConfig lockScreenConfig, Context context, ISd
customView = lockScreenConfig.getCustomView();
lockScreenEnabled = lockScreenConfig.isEnabled();
deviceLogoEnabled = lockScreenConfig.isDeviceLogoEnabled();
displayMode = lockScreenConfig.getDisplayMode();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When the display mode is set to DISPLAY_MODE_ALWAYS, the lock screen cannot be dismissed even if enableDismissGesture=true. not sure if that is intentional or a bug.

@bilal-alsharifi bilal-alsharifi merged commit ba67eef into develop Aug 28, 2019
@bilal-alsharifi bilal-alsharifi deleted the feature/lockscreen_changes branch August 28, 2019 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
proposal Accepted SDL Evolution Proposal
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants