From 0338bedf38d659421769aa5ab3829ee1ef1389aa Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 12 Mar 2016 17:40:20 -0800
Subject: [PATCH] revert change adding new notification icon. It's not required
 when building for SDK 19, and I don't want to release it without testing on
 more OS versions.

---
 xwords4/android/XWords4/archive/R.java        |  43 +++++++++---------
 .../android/XWords4/res/drawable/notify.png   | Bin 5941 -> 0 bytes
 .../src/org/eehouse/android/xw4/Utils.java    |   2 +-
 3 files changed, 22 insertions(+), 23 deletions(-)
 delete mode 100644 xwords4/android/XWords4/res/drawable/notify.png

diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java
index 5b8e15bb1..b3245827c 100644
--- a/xwords4/android/XWords4/archive/R.java
+++ b/xwords4/android/XWords4/archive/R.java
@@ -58,28 +58,27 @@ public final class R {
         public static final int multigame__gen=0x7f020013;
         public static final int new_group__gen=0x7f020014;
         public static final int next_hint=0x7f020015;
-        public static final int notify=0x7f020016;
-        public static final int origin=0x7f020017;
-        public static final int out_arrow=0x7f020018;
-        public static final int out_arrow_active=0x7f020019;
-        public static final int prefs__gen=0x7f02001a;
-        public static final int prev_hint=0x7f02001b;
-        public static final int refresh=0x7f02001c;
-        public static final int relabel__gen=0x7f02001d;
-        public static final int reset__gen=0x7f02001e;
-        public static final int rightarrow=0x7f02001f;
-        public static final int save__gen=0x7f020020;
-        public static final int search__gen=0x7f020021;
-        public static final int select_all__gen=0x7f020022;
-        public static final int send__gen=0x7f020023;
-        public static final int shuffle=0x7f020024;
-        public static final int sologame__gen=0x7f020025;
-        public static final int stat_notify_chat=0x7f020026;
-        public static final int stat_notify_sync=0x7f020027;
-        public static final int undo=0x7f020028;
-        public static final int up__gen=0x7f020029;
-        public static final int values=0x7f02002a;
-        public static final int zoom=0x7f02002b;
+        public static final int origin=0x7f020016;
+        public static final int out_arrow=0x7f020017;
+        public static final int out_arrow_active=0x7f020018;
+        public static final int prefs__gen=0x7f020019;
+        public static final int prev_hint=0x7f02001a;
+        public static final int refresh=0x7f02001b;
+        public static final int relabel__gen=0x7f02001c;
+        public static final int reset__gen=0x7f02001d;
+        public static final int rightarrow=0x7f02001e;
+        public static final int save__gen=0x7f02001f;
+        public static final int search__gen=0x7f020020;
+        public static final int select_all__gen=0x7f020021;
+        public static final int send__gen=0x7f020022;
+        public static final int shuffle=0x7f020023;
+        public static final int sologame__gen=0x7f020024;
+        public static final int stat_notify_chat=0x7f020025;
+        public static final int stat_notify_sync=0x7f020026;
+        public static final int undo=0x7f020027;
+        public static final int up__gen=0x7f020028;
+        public static final int values=0x7f020029;
+        public static final int zoom=0x7f02002a;
     }
     public static final class id {
         public static final int about_xlator=0x7f0a0001;
diff --git a/xwords4/android/XWords4/res/drawable/notify.png b/xwords4/android/XWords4/res/drawable/notify.png
deleted file mode 100644
index dcd4cfe6eeddd3f0c0a0f9078558deaaeecb3e9d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5941
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
Xnf5(7E_IU200000NkvXXu0mjf=B#rJ

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
index 7bc73514c..b2d15be2e 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
@@ -214,7 +214,7 @@ public class Utils {
                                          PendingIntent.FLAG_ONE_SHOT );
 
         Notification notification = 
-            new Notification( R.drawable.notify, title,
+            new Notification( R.drawable.icon48x48, title,
                               System.currentTimeMillis() );
 
         notification.flags |= Notification.FLAG_AUTO_CANCEL;