Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'android_branch' of ssh://maidu2/home/eehouse/src/git/repos/xwords into android_branch

Browse source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Eric House 2015-07-11 08:09:47 -07:00
commit 384721d68d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
View file

@ -204,8 +204,8 @@ public class Utils {
Intents is to send a different second param each time, Intents is to send a different second param each time,
though the docs say that param's ignored. though the docs say that param's ignored.
*/ */
PendingIntent pi = PendingIntent pi = null == intent ? null
PendingIntent.getActivity( context, Utils.nextRandomInt(), intent, : PendingIntent.getActivity( context, Utils.nextRandomInt(), intent,
PendingIntent.FLAG_ONE_SHOT ); PendingIntent.FLAG_ONE_SHOT );
Notification notification = Notification notification =