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.

Sign up for GitHub

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

Jump to bottom

[TIMOB-24629] (6_2_X) Android: Add Notification wakeLock #9307

Merged
merged 3 commits into from Aug 28, 2017
Merged

[TIMOB-24629] (6_2_X) Android: Add Notification wakeLock #9307

merged 3 commits into from Aug 28, 2017

Conversation

hansemannn
Copy link
Collaborator

@hansemannn hansemannn added this to the 6.2.0 milestone Aug 11, 2017
@hansemannn hansemannn mentioned this pull request Aug 11, 2017
Merged
garymathews
garymathews approved these changes Aug 14, 2017
View reviewed changes
Copy link
Contributor

@garymathews garymathews left a comment

Choose a reason for hiding this comment

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

CR: PASS

👍

@lokeshchdhry
Copy link
Contributor

@garymathews , Can you please resolve the conflicts. Thanks.

@lokeshchdhry
Copy link
Contributor

@hansemannn , can you please resolve the conflicts so that I can merge this PR.

hansemannn
hansemannn commented Aug 24, 2017
View reviewed changes
...ules/android/src/java/ti/modules/titanium/android/notificationmanager/NotificationProxy.java Outdated
if (d.containsKey(TiC.PROPERTY_GROUP_ALERT_BEHAVIOR)) {
setGroupAlertBehavior(TiConvert.toInt(d, TiC.PROPERTY_GROUP_ALERT_BEHAVIOR));
}
*/
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@garymathews Just to be sure: This needs to be uncommented in 6_2_X? This was part of the merge-conflicts.

@garymathews
Copy link
Contributor

@lokeshchdhry Fixed merge conflict

@lokeshchdhry
Copy link
Contributor

Wake lock flags works as expected with appropriate wake lock level and flags.

Studio Ver: 4.9.1.201707200100
SDK Ver: 6.2.0 local build
OS Ver: 10.12.3
Xcode Ver: Xcode 8.3.3
Appc NPM: 4.2.9
Appc CLI: 6.2.3
Ti CLI Ver: 5.0.14
Alloy Ver: 1.9.13
Node Ver: 6.10.1
Java Ver: 1.8.0_101
Devices: ⇨ google Pixel --- Android 7.1.1
⇨ google Nexus 5 --- Android 6.0.1
⇨ Motorola G2 --- Android 4.4.4

@lokeshchdhry lokeshchdhry merged commit 9e0575e into tidev:6_2_X Aug 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garymathews garymathews garymathews approved these changes

Assignees
No one assigned
Labels
android community 🔥 feature in-qe-testing 🕵
Projects
None yet
Milestone
6.2.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@hansemannn @lokeshchdhry @garymathews @m1ga