Merge lp:~charlesk/indicator-datetime/lp-1370594-refresh-notifications-to-match-design into lp:indicator-datetime/13.10

[Charles Kerr]

Make alarm notifications icons and button color match Design's specs.

== Description of the Change

 1. Use the new affirmative-tint hint to color the "OK" button.

 2. Work around unity-notifications bug #1370641 to remove the border around the notification's icon.

I.e., the green button coloring and icon now match design: https://i.imgur.com/Y8SHGnw.png

== Checklist

> Are there any related MPs required for this MP to build/function as expected? Please list.

No

> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)

Yes

> Did the code build without warnings?

Yes

> Did the tests run successfully?

Yes

> Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

> What device (or emulator) has your component test plan been executed successfully on?

mako + RTM r46

> What manual tests are relevant for this MP?

Run any of the manual tests that involves creating an alarm; e.g. indicator-datetime/snooze, and confirm that the notification's icon and button color look like https://i.imgur.com/Y8SHGnw.png

> Did you include a link to the MR Review Checklist Template to make your reviewer's life easier?

https://wiki.ubuntu.com/Process/Merges/Checklists/indicator-datetime

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:380
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/280/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/54/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/280/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

[Nekhelesh Ramananthan (nik90)]

Tested on Mako Image 244 and works nicely!

review: Approve

[Nekhelesh Ramananthan (nik90)]

Please let me confirm with designer tomorrow morning regarding the new visual.

=== modified file 'include/notifications/notifications.h'
--- include/notifications/notifications.h	2014-07-30 22:59:52 +0000
+++ include/notifications/notifications.h	2014-09-17 17:58:35 +0000
@@ -59,8 +59,9 @@
        These keys may be dependent on the notification server. */
     void add_hint (const std::string& name);
     static constexpr char const * HINT_SNAP {"x-canonical-snap-decisions"};
-    static constexpr char const * HINT_TINT {"x-canonical-private-button-tint"};
-    static constexpr char const * HINT_NONSHAPEDICON {"x-canonical-non-shaped-icon"};
+    static constexpr char const * HINT_NONSHAPED_ICON {"x-canonical-non-shaped-icon"};
+    static constexpr char const * HINT_AFFIRMATIVE_HINT {"x-canonical-private-affirmative-tint"};
+    static constexpr char const * HINT_REJECTION_TINT {"x-canonical-private-rejection-tint"};
 
     /* Add an action button.
        This may fail if the Engine doesn't support actions.

=== modified file 'src/notifications.cpp'
--- src/notifications.cpp	2014-08-08 20:31:49 +0000
+++ src/notifications.cpp	2014-09-17 17:58:35 +0000
@@ -198,7 +198,7 @@
         {
             notify_notification_set_hint (nn.get(),
                                           hint.c_str(),
-                                          g_variant_new_boolean(true));
+                                          g_variant_new_string("true"));
         }
 
         for (const auto& action : info.m_actions)

=== modified file 'src/snap.cpp'
--- src/snap.cpp	2014-09-15 14:56:29 +0000
+++ src/snap.cpp	2014-09-17 17:58:35 +0000
@@ -91,8 +91,8 @@
         b.set_body (appointment.summary);
         b.set_icon_name ("alarm-clock");
         b.add_hint (uin::Builder::HINT_SNAP);
-        b.add_hint (uin::Builder::HINT_TINT);
-        b.add_hint (uin::Builder::HINT_NONSHAPEDICON);
+        b.add_hint (uin::Builder::HINT_AFFIRMATIVE_HINT);
+        b.add_hint (uin::Builder::HINT_NONSHAPED_ICON);
 
         const char * timefmt;
         if (is_locale_12h()) {