jenkins-bot has submitted this change and it was merged. Change subject: Fix/restore Wikipedia Zero enter notification. ......................................................................
Fix/restore Wikipedia Zero enter notification. For some reason, the notification when entering a Zero network seems to have disappeared (?), along with the code that produces it. This seems to have been due to https://gerrit.wikimedia.org/r/317166 This brings back that notification, and also adds separate icons for entering and leaving a Zero network. Bug: T150258 Change-Id: I21d556b0ea4f3fae27f4d98e4d11f0ee9674763f --- M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java A app/src/main/res/drawable/ic_wikipedia_zero_off.xml A app/src/main/res/drawable/ic_wikipedia_zero_on.xml M app/src/main/res/values/dimens.xml 4 files changed, 69 insertions(+), 1 deletion(-) Approvals: Mholloway: Looks good to me, but someone else must approve jenkins-bot: Verified Niedzielski: Looks good to me, approved diff --git a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java index 682671a..e71bcb3 100644 --- a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java +++ b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java @@ -223,6 +223,10 @@ zeroFunnel = new WikipediaZeroUsageFunnel(app, zeroCarrierString, StringUtil.emptyIfNull(zeroCarrierMetaString)); app.getBus().post(new WikipediaZeroEnterEvent()); + if (zeroConfig.hashCode() != Prefs.zeroConfigHashCode()) { + notifyEnterZeroNetwork(app, zeroConfig); + } + Prefs.zeroConfigHashCode(zeroConfig.hashCode()); acquiringCarrierMessage = false; } @@ -265,9 +269,24 @@ return null; } + private void notifyEnterZeroNetwork(@NonNull Context context, @NonNull ZeroConfig config) { + NotificationCompat.Builder builder = createNotification(context); + builder.setColor(config.getBackground()) + .setSmallIcon(R.drawable.ic_wikipedia_zero_on) + .setLights(config.getBackground(), + context.getResources().getInteger(R.integer.zero_notification_light_on_ms), + context.getResources().getInteger(R.integer.zero_notification_light_off_ms)) + .setContentText(context.getString(R.string.zero_learn_more)) + .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(R.string.zero_learn_more))) + .addAction(0, context.getString(R.string.zero_learn_more_learn_more), + pendingIntentForUrl(context, context.getString(R.string.zero_webpage_url))); + showNotification(context, builder.build()); + } + private void notifyExitZeroNetwork(@NonNull Context context) { NotificationCompat.Builder builder = createNotification(context); builder.setColor(ContextCompat.getColor(context, R.color.foundation_red)) + .setSmallIcon(R.drawable.ic_wikipedia_zero_off) .setContentText(context.getString(R.string.zero_charged_verbiage)) .setAutoCancel(true) .addAction(0, context.getString(R.string.zero_learn_more_learn_more), @@ -278,7 +297,6 @@ private NotificationCompat.Builder createNotification(@NonNull Context context) { return (NotificationCompat.Builder) new NotificationCompat.Builder(context) .setPriority(NotificationCompat.PRIORITY_MAX) - .setSmallIcon(R.drawable.ic_notification) .setContentTitle(context.getString(R.string.zero_wikipedia_zero_heading)) .setContentIntent(PendingIntent .getActivity(context, 0, new Intent(context, MainActivity.class), 0)); diff --git a/app/src/main/res/drawable/ic_wikipedia_zero_off.xml b/app/src/main/res/drawable/ic_wikipedia_zero_off.xml new file mode 100644 index 0000000..0075c03 --- /dev/null +++ b/app/src/main/res/drawable/ic_wikipedia_zero_off.xml @@ -0,0 +1,27 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android"; + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:pathData="m23.95,5.05c0,0.081 -0.027,0.154 -0.08,0.221 -0.053,0.067 -0.112,0.101 -0.175,0.101 -0.524,0.047 -0.952,0.206 -1.285,0.478 -0.333,0.272 -0.676,0.79 -1.03,1.555l-5.416,11.565c-0.035,0.107 -0.135,0.161 -0.297,0.161 -0.127,0 -0.227,-0.054 -0.297,-0.161l-3.037,-6.019 -3.494,6.019c-0.071,0.107 -0.17,0.161 -0.297,0.161 -0.156,0 -0.258,-0.054 -0.308,-0.161L2.913,7.405C2.58,6.687 2.23,6.186 1.862,5.901 1.494,5.615 0.98,5.439 0.322,5.372c-0.057,0 -0.11,-0.029 -0.159,-0.086 -0.05,-0.057 -0.074,-0.122 -0.074,-0.196 0,-0.188 0.057,-0.282 0.17,-0.282 0.474,0 0.97,0.02 1.487,0.06 0.481,0.04 0.934,0.06 1.359,0.06 0.432,0 0.942,-0.02 1.529,-0.06 0.616,-0.04 1.161,-0.06 1.635,-0.06 0.113,0 0.17,0.094 0.17,0.282 0,0.188 -0.035,0.282 -0.106,0.282C5.858,5.406 5.485,5.52 5.212,5.714 4.94,5.909 4.803,6.164 4.803,6.479c0,0.161 0.057,0.362 0.17,0.604L9.37,16.494 11.865,12.025 9.539,7.405C9.122,6.58 8.778,6.048 8.509,5.81 8.24,5.572 7.833,5.426 7.288,5.372c-0.05,0 -0.097,-0.029 -0.143,-0.086 -0.046,-0.057 -0.069,-0.122 -0.069,-0.196 0,-0.188 0.05,-0.282 0.149,-0.282 0.474,0 0.91,0.02 1.306,0.06 0.382,0.04 0.789,0.06 1.221,0.06 0.425,0 0.874,-0.02 1.349,-0.06 0.488,-0.04 0.97,-0.06 1.444,-0.06 0.113,0 0.17,0.094 0.17,0.282 0,0.188 -0.035,0.282 -0.106,0.282 -0.949,0.06 -1.423,0.315 -1.423,0.765 0,0.201 0.11,0.513 0.329,0.936l1.54,2.959 1.529,-2.708c0.212,-0.382 0.319,-0.705 0.319,-0.966 0,-0.617 -0.474,-0.946 -1.423,-0.986 -0.085,0 -0.127,-0.094 -0.127,-0.282 0,-0.067 0.021,-0.131 0.064,-0.191 0.042,-0.06 0.085,-0.091 0.127,-0.091 0.34,0 0.757,0.02 1.253,0.06 0.474,0.04 0.864,0.06 1.168,0.06 0.219,0 0.542,-0.017 0.966,-0.05 0.538,-0.047 0.988,-0.07 1.349,-0.07 0.085,0 0.127,0.081 0.127,0.242 0,0.215 -0.078,0.322 -0.234,0.322 -0.552,0.054 -0.996,0.198 -1.333,0.433 -0.336,0.235 -0.756,0.768 -1.258,1.6l-2.039,3.573 2.761,5.335 4.078,-8.988c0.142,-0.329 0.212,-0.631 0.212,-0.906 0,-0.658 -0.474,-1.007 -1.423,-1.047 -0.085,0 -0.127,-0.094 -0.127,-0.282 -0,-0.188 0.064,-0.282 0.191,-0.282 0.347,0 0.757,0.02 1.232,0.06 0.439,0.04 0.807,0.06 1.104,0.06 0.311,0 0.673,-0.02 1.083,-0.06 0.425,-0.04 0.807,-0.06 1.147,-0.06 0.099,0 0.149,0.081 0.149,0.242l0,0z" + android:strokeColor="#00000000" + android:fillColor="#ffffff" + android:strokeWidth="1"/> + <path + android:pathData="M18.589,19.005a2.109,2.551 0,1 0,4.217 0a2.109,2.551 0,1 0,-4.217 0z" + android:fillAlpha="0.25098039" + android:strokeColor="#ffffff" + android:fillColor="#00000000" + android:strokeWidth="1.10300004" + android:strokeLineJoin="round" + android:strokeAlpha="1"/> + <path + android:pathData="M0.531,10.689h22.875v1.692h-22.875z" + android:fillAlpha="1" + android:strokeColor="#00000000" + android:fillColor="#ffffff" + android:strokeWidth="0.80299997" + android:strokeLineJoin="round" + android:strokeAlpha="1"/> +</vector> diff --git a/app/src/main/res/drawable/ic_wikipedia_zero_on.xml b/app/src/main/res/drawable/ic_wikipedia_zero_on.xml new file mode 100644 index 0000000..217c0a7 --- /dev/null +++ b/app/src/main/res/drawable/ic_wikipedia_zero_on.xml @@ -0,0 +1,19 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android"; + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:pathData="m23.95,5.05c0,0.081 -0.027,0.154 -0.08,0.221 -0.053,0.067 -0.112,0.101 -0.175,0.101 -0.524,0.047 -0.952,0.206 -1.285,0.478 -0.333,0.272 -0.676,0.79 -1.03,1.555l-5.416,11.565c-0.035,0.107 -0.135,0.161 -0.297,0.161 -0.127,0 -0.227,-0.054 -0.297,-0.161l-3.037,-6.019 -3.494,6.019c-0.071,0.107 -0.17,0.161 -0.297,0.161 -0.156,0 -0.258,-0.054 -0.308,-0.161L2.913,7.405C2.58,6.687 2.23,6.186 1.862,5.901 1.494,5.615 0.98,5.439 0.322,5.372c-0.057,0 -0.11,-0.029 -0.159,-0.086 -0.05,-0.057 -0.074,-0.122 -0.074,-0.196 0,-0.188 0.057,-0.282 0.17,-0.282 0.474,0 0.97,0.02 1.487,0.06 0.481,0.04 0.934,0.06 1.359,0.06 0.432,0 0.942,-0.02 1.529,-0.06 0.616,-0.04 1.161,-0.06 1.635,-0.06 0.113,0 0.17,0.094 0.17,0.282 0,0.188 -0.035,0.282 -0.106,0.282C5.858,5.406 5.485,5.52 5.212,5.714 4.94,5.909 4.803,6.164 4.803,6.479c0,0.161 0.057,0.362 0.17,0.604L9.37,16.494 11.865,12.025 9.539,7.405C9.122,6.58 8.778,6.048 8.509,5.81 8.24,5.572 7.833,5.426 7.288,5.372c-0.05,0 -0.097,-0.029 -0.143,-0.086 -0.046,-0.057 -0.069,-0.122 -0.069,-0.196 0,-0.188 0.05,-0.282 0.149,-0.282 0.474,0 0.91,0.02 1.306,0.06 0.382,0.04 0.789,0.06 1.221,0.06 0.425,0 0.874,-0.02 1.349,-0.06 0.488,-0.04 0.97,-0.06 1.444,-0.06 0.113,0 0.17,0.094 0.17,0.282 0,0.188 -0.035,0.282 -0.106,0.282 -0.949,0.06 -1.423,0.315 -1.423,0.765 0,0.201 0.11,0.513 0.329,0.936l1.54,2.959 1.529,-2.708c0.212,-0.382 0.319,-0.705 0.319,-0.966 0,-0.617 -0.474,-0.946 -1.423,-0.986 -0.085,0 -0.127,-0.094 -0.127,-0.282 0,-0.067 0.021,-0.131 0.064,-0.191 0.042,-0.06 0.085,-0.091 0.127,-0.091 0.34,0 0.757,0.02 1.253,0.06 0.474,0.04 0.864,0.06 1.168,0.06 0.219,0 0.542,-0.017 0.966,-0.05 0.538,-0.047 0.988,-0.07 1.349,-0.07 0.085,0 0.127,0.081 0.127,0.242 0,0.215 -0.078,0.322 -0.234,0.322 -0.552,0.054 -0.996,0.198 -1.333,0.433 -0.336,0.235 -0.756,0.768 -1.258,1.6l-2.039,3.573 2.761,5.335 4.078,-8.988c0.142,-0.329 0.212,-0.631 0.212,-0.906 0,-0.658 -0.474,-1.007 -1.423,-1.047 -0.085,0 -0.127,-0.094 -0.127,-0.282 -0,-0.188 0.064,-0.282 0.191,-0.282 0.347,0 0.757,0.02 1.232,0.06 0.439,0.04 0.807,0.06 1.104,0.06 0.311,0 0.673,-0.02 1.083,-0.06 0.425,-0.04 0.807,-0.06 1.147,-0.06 0.099,0 0.149,0.081 0.149,0.242l0,0z" + android:strokeColor="#00000000" + android:fillColor="#ffffff" + android:strokeWidth="1"/> + <path + android:pathData="M18.589,19.005a2.109,2.551 0,1 0,4.217 0a2.109,2.551 0,1 0,-4.217 0z" + android:fillAlpha="0.25098039" + android:strokeColor="#ffffff" + android:fillColor="#00000000" + android:strokeWidth="1.10300004" + android:strokeLineJoin="round" + android:strokeAlpha="1"/> +</vector> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index fe8479b..fae8777 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -83,6 +83,10 @@ <!-- Crash report --> <item name="crash_report_icon_alpha" format="float" type="dimen">.5</item> + <!-- Zero --> + <integer name="zero_notification_light_on_ms">500</integer> + <integer name="zero_notification_light_off_ms">3000</integer> + <!-- The Feed --> <dimen name="view_feed_padding_top">10dp</dimen> <dimen name="view_feed_min_column_width">320dp</dimen> -- To view, visit https://gerrit.wikimedia.org/r/320777 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I21d556b0ea4f3fae27f4d98e4d11f0ee9674763f Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
