SDL 0119 - SDL Passenger Mode by Tnnnguyen · Pull Request #1088 · smartdevicelink/sdl_java_suite

Tnnnguyen · 2019-06-06T15:06:38Z

Fixes # SDL-0119

Revised to accommodate changes from Revise SDL-0119 SDL Passenger Mode

This PR is [ready] for review.

Risk

This PR makes [no] API changes.

Testing Plan

Test with the new Boolean bit from OnDriverDistraction, if it's true, the lockscreen can be dismissed.

Summary

The lockscreen can be swiped to dismiss if dismissible

CLA

[x ] I have signed the CLA

Lockscreen dismiss

Add get/set method to OnDriverDistraction for lockscreen dismissibility Notify LockScreenActivity if lockscreen is dismissible Handle swipe action for lockscreen UI

Commit the rest of the changes that were not committed.

Commit changes to OnDriverDistraction

codecov-io · 2019-06-06T15:45:17Z

Codecov Report

Merging #1088 into develop will increase coverage by 0.03%.
The diff coverage is 4.65%.

@@              Coverage Diff              @@
##             develop    #1088      +/-   ##
=============================================
+ Coverage       46.7%   46.73%   +0.03%     
- Complexity      3860     4024     +164     
=============================================
  Files            440      455      +15     
  Lines          21113    22228    +1115     
  Branches        2335     2524     +189     
=============================================
+ Hits            9860    10388     +528     
- Misses         10699    11228     +529     
- Partials         554      612      +58

Impacted Files	Coverage Δ	Complexity Δ
...ink/managers/lockscreen/SDLLockScreenActivity.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...smartdevicelink/proxy/rpc/OnDriverDistraction.java	`62.5% <14.28%> (-37.5%)`	`5 <0> (ø)`
...icelink/managers/lockscreen/LockScreenManager.java	`28.46% <5.26%> (-3.98%)`	`6 <0> (ø)`
...tdevicelink/managers/screen/BaseScreenManager.java	`67.71% <0%> (-7.06%)`	`41% <0%> (ø)`
...tdevicelink/managers/audio/AudioDecoderCompat.java	`70% <0%> (-3.34%)`	`3% <0%> (ø)`
...smartdevicelink/managers/screen/menu/MenuCell.java	`88.23% <0%> (-1.32%)`	`28% <0%> (ø)`
...tdevicelink/managers/audio/AudioStreamManager.java	`45.5% <0%> (-0.43%)`	`13% <0%> (+1%)`
...om/smartdevicelink/transport/SdlRouterService.java	`11.83% <0%> (-0.01%)`	`20% <0%> (ø)`
...vicelink/proxy/rpc/ClimateControlCapabilities.java	`100% <0%> (ø)`	`37% <0%> (+2%)`	⬆️
...rtdevicelink/managers/screen/SoftButtonObject.java	`61.64% <0%> (ø)`	`19% <0%> (ø)`	⬇️
... and 32 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 23bb686...ae6a3ae. Read the comment docs.

theresalech

@Tnnnguyen I've found a few required change, per the accepted proposal

Actual: No message is displayed that indicates you can dismiss the lock screen.
Expected: "Dismissals should include a warning to the user and ensure that they are not the driver."

Tnnnguyen · 2019-06-17T21:40:12Z

@theresalech What is the exact wording of the additional message that you want? Also where is the new message's location within the lock screen?

Tnnnguyen · 2019-06-19T17:16:22Z

@theresalech Do you have the exact wording of the additional message that you want? Also where is the new message's location within the lock screen?

theresalech · 2019-06-19T18:03:02Z

@Tnnnguyen there is a proposal in review to confirm this wording: smartdevicelink/sdl_evolution#769.

Tnnnguyen · 2019-06-19T18:28:55Z

@theresalech thanks.

- Change dismiss motion from swipe up to swipe down - Lockscreen should not show again if user has already dismissed it for the same run - Parse lockscreen warning message from core - Add getter/setter for warning message to OnDriverDistraction

theresalech · 2019-07-11T14:53:23Z

@Tnnnguyen the lock screen dismissal message can be at the bottom of the screen, replacing the "Locked for your safety" text. You can see the iOS implementation for reference: smartdevicelink/sdl_ios#1296.

Tnnnguyen · 2019-07-11T15:04:09Z

@theresalech thanks, I kind of guess, so I made that change on my last revision.

- Utilize previous null check logic for context.get()

…ted but LockscreenManager is disposed

Tnnnguyen · 2019-07-16T17:31:01Z

@theresalech this PR is ready for review, thanks.

BrettyWhite · 2019-07-17T14:36:44Z

 	protected boolean lockScreenEnabled, deviceLogoEnabled;
 	protected int lockScreenIcon, lockScreenColor, customView;
 	protected Bitmap deviceLogo;
+	private boolean mIsLockscreenDissmissible;


BrettyWhite · 2019-07-17T14:38:48Z

 				// do something with the status
 				if (notification != null) {
 					OnDriverDistraction ddState = (OnDriverDistraction) notification;
+					Boolean isDismissable = ddState.getLockscreenDismissibility();


BrettyWhite · 2019-07-17T14:39:17Z

 					OnDriverDistraction ddState = (OnDriverDistraction) notification;
+					Boolean isDismissable = ddState.getLockscreenDismissibility();
+					if (isDismissable != null) {
+						mIsLockscreenDissmissible = isDismissable;


BrettyWhite · 2019-07-17T14:43:18Z

 */
 public class OnDriverDistraction  extends RPCNotification {
 	public static final String KEY_STATE = "state";
+    public static final String KEY_LOCKSCREEN_DISMISSIBLE = "lockScreenDismissalEnabled";


can you fix the indentations to match?

Done, no change, mis-alignment is from previous code.

BrettyWhite · 2019-07-17T14:44:04Z

+
+    /**
+     * <p>Called to set dismissible state of Lockscreen</p>
+     * @param isDismissible the Lockscreen'S dismissibility


Suggested change

* @param isDismissible the Lockscreen'S dismissibility

* @param isDismissible the Lockscreen's dismissibility

BrettyWhite · 2019-07-17T14:44:58Z

+     * <p>Called to get the dismissible state of Lockscreen</p>
+     * @return true if the Lockscreen is dismissible, false otherwise
+     */
+    public Boolean getLockscreenDismissibility() {


The setter and getter method naming should match for the same key

BrettyWhite · 2019-07-17T14:46:15Z

+	}
+
+
+		@Override


double space and indentation

- Fix spellings, remove unwanted double space - Match getter/setter name

BrettyWhite · 2019-07-30T14:46:14Z

 	public static final String LOCKSCREEN_DEVICE_LOGO_DOWNLOADED = "LOCKSCREEN_DEVICE_LOGO_DOWNLOADED";
 	public static final String CLOSE_LOCK_SCREEN_ACTION = "CLOSE_LOCK_SCREEN";
+	public static final String KEY_LOCKSCREEN_DISMISSED = "KEY_LOCKSCREEN_DISMISSED";
+	public static final String KEY_LOCKSCREEN_DISIMISSIBLE = "KEY_LOCKSCREEN_DISIMISSIBLE";


* develop_mainRepo: (207 commits) Update travis file Update changelog for 4.9.1 Update VERSION_NAME to 4.9.1 Fix vr optional issue remove unused import Add getBytesAvailable() to FileManagerTest Add getBytesAvailable() to FileManager Add templateTitle to TextFieldNameTests Add templateTitle to TextFieldName enum Fix formatting issue Add unit tests for setting buttonId logic Fix borken SoftButton tests Calc maxButtonIdsSetByDev manually turn default oem icon setting to true Extract ids setting logic into a spearate method Update setButtonId() javadoc Remove additional semicolon BaseSoftButtonManager Roll softbutton ids over to 0 when max is reached Improve setting softbutton ids logic fix broken test ...

Tnnnguyen and others added 4 commits June 5, 2019 16:02

Merge pull request #1 from smartdevicelink/develop

dafab74

Lockscreen dismiss

Proposal: SDL-0119

13f96ef

Add get/set method to OnDriverDistraction for lockscreen dismissibility Notify LockScreenActivity if lockscreen is dismissible Handle swipe action for lockscreen UI

Proposal: SDL-0119

034c42d

Commit the rest of the changes that were not committed.

Proposal: SDL-0119

edb79a1

Commit changes to OnDriverDistraction

theresalech changed the title ~~Lockscreen dismiss~~ SDL 0119 - SDL Passenger Mode Jun 11, 2019

theresalech requested changes Jun 12, 2019

View reviewed changes

Tnnnguyen added 2 commits July 10, 2019 13:45

Fix typo

f6bb7ff

Tnnnguyen added 2 commits July 11, 2019 09:00

Fix failed CI build

58a9e50

- Utilize previous null check logic for context.get()

Fix failed CI build, handle the case where the lockscreen is not star…

4ad563e

…ted but LockscreenManager is disposed

BrettyWhite suggested changes Jul 17, 2019

View reviewed changes

Tnnnguyen added 2 commits July 17, 2019 10:22

Fix per code review's recommendations:

d266f76

- Fix spellings, remove unwanted double space - Match getter/setter name

Fix per code review's recommendation, commit the rest that was left out.

ae6a3ae

BrettyWhite reviewed Jul 30, 2019

View reviewed changes

Fixed typo

b7bf3c8

BrettyWhite approved these changes Jul 30, 2019

View reviewed changes

BrettyWhite merged commit 4e429a8 into smartdevicelink:develop Jul 31, 2019

BrettyWhite mentioned this pull request Jul 31, 2019

[SDL 0119] SDL Passenger Mode #735

Closed

	* @param isDismissible the Lockscreen'S dismissibility
	* @param isDismissible the Lockscreen's dismissibility

Conversation

Tnnnguyen commented Jun 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Risk

Testing Plan

Summary

CLA

Uh oh!

codecov-io commented Jun 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

theresalech left a comment

Choose a reason for hiding this comment

Uh oh!

Tnnnguyen commented Jun 17, 2019

Uh oh!

Tnnnguyen commented Jun 19, 2019

Uh oh!

theresalech commented Jun 19, 2019

Uh oh!

Tnnnguyen commented Jun 19, 2019

Uh oh!

theresalech commented Jul 11, 2019

Uh oh!

Tnnnguyen commented Jul 11, 2019

Uh oh!

Tnnnguyen commented Jul 16, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Tnnnguyen commented Jun 6, 2019 •

edited

Loading

codecov-io commented Jun 6, 2019 •

edited

Loading