diff --git a/Notes-master/.idea/.gitignore b/Notes-master/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/Notes-master/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/Notes-master/.idea/misc.xml b/Notes-master/.idea/misc.xml
new file mode 100644
index 0000000..07115cd
--- /dev/null
+++ b/Notes-master/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/.idea/modules.xml b/Notes-master/.idea/modules.xml
new file mode 100644
index 0000000..7800270
--- /dev/null
+++ b/Notes-master/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/.idea/vcs.xml b/Notes-master/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/Notes-master/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/Notes-master.iml b/Notes-master/Notes-master.iml
new file mode 100644
index 0000000..c90834f
--- /dev/null
+++ b/Notes-master/Notes-master.iml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
index b3b61e7..a1deb99 100644
--- a/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -64,21 +64,22 @@ public class GTaskASyncTask extends AsyncTask {
}
private void showNotification(int tickerId, String content) {
- Notification notification = new Notification(R.drawable.notification, mContext
- .getString(tickerId), System.currentTimeMillis());
- notification.defaults = Notification.DEFAULT_LIGHTS;
- notification.flags = Notification.FLAG_AUTO_CANCEL;
PendingIntent pendingIntent;
if (tickerId != R.string.ticker_success) {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
- NotesPreferenceActivity.class), 0);
-
+ NotesPreferenceActivity.class), PendingIntent.FLAG_IMMUTABLE);
} else {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
- NotesListActivity.class), 0);
+ NotesListActivity.class), PendingIntent.FLAG_IMMUTABLE);
}
- notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
- pendingIntent);
+ Notification.Builder builder = new Notification.Builder(mContext)
+ .setAutoCancel(true)
+ .setContentTitle(mContext.getString(R.string.app_name))
+ .setContentText(content)
+ .setContentIntent(pendingIntent)
+ .setWhen(System.currentTimeMillis())
+ .setOngoing(true);
+ Notification notification=builder.getNotification();
mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
}
diff --git a/Test002.txt b/新建 文本文档.txt
similarity index 100%
rename from Test002.txt
rename to 新建 文本文档.txt