git.iko.soy/unity8
on xenial help sign in
Rename mock phone-app to dialer-app, to match modern usage and this branch's hard-coding of the name for the dialer
d4c4cb1Michael Terry
qml/Dash/graphics/phone/screenshots/phone@12.png → qml/Dash/graphics/phone/screenshots/dialer@12.pngrenamed
compare with xenial
unifiedsplit

Binary file not shown.

qml/graphics/applicationIcons/phone-app@18.png → qml/graphics/applicationIcons/dialer-app@18.pngrenamed

Binary file not shown.

tests/autopilot/unity8/shell/tests/test_notifications.py+4−4
@@ -137,7 +137,7 @@ class InteractiveNotificationBase(NotificationsBase):
137 ("x-canonical-switch-to-application", "true"),
137 ("x-canonical-switch-to-application", "true"),
138 (
138 (
139 "x-canonical-secondary-icon",
139 "x-canonical-secondary-icon",
140− self._get_icon_path('applicationIcons/phone-app.png')
140+ self._get_icon_path('applicationIcons/dialer-app.png')
141 )
141 )
142 ]
142 ]
143
143
@@ -172,7 +172,7 @@ class InteractiveNotificationBase(NotificationsBase):
172 hints = [
172 hints = [
173 (
173 (
174 "x-canonical-secondary-icon",
174 "x-canonical-secondary-icon",
175− self._get_icon_path('applicationIcons/phone-app.png')
175+ self._get_icon_path('applicationIcons/dialer-app.png')
176 ),
176 ),
177 ("x-canonical-snap-decisions", "true"),
177 ("x-canonical-snap-decisions", "true"),
178 ]
178 ]
@@ -435,7 +435,7 @@ class EphemeralNotificationsTests(NotificationsBase):
435 hints = [
435 hints = [
436 (
436 (
437 "x-canonical-secondary-icon",
437 "x-canonical-secondary-icon",
438− self._get_icon_path('applicationIcons/phone-app.png')
438+ self._get_icon_path('applicationIcons/dialer-app.png')
439 )
439 )
440 ]
440 ]
441
441
@@ -677,7 +677,7 @@ class EphemeralNotificationsTests(NotificationsBase):
677 body = 'This bubble uses the icon-title-body layout with a ' \
677 body = 'This bubble uses the icon-title-body layout with a ' \
678 'secondary icon.'
678 'secondary icon.'
679 icon_path = self._get_icon_path('avatars/anna_olsson.png')
679 icon_path = self._get_icon_path('avatars/anna_olsson.png')
680− hint_icon = self._get_icon_path('applicationIcons/phone-app.png')
680+ hint_icon = self._get_icon_path('applicationIcons/dialer-app.png')
681
681
682 notification = shell.create_ephemeral_notification(
682 notification = shell.create_ephemeral_notification(
683 summary,
683 summary,
tests/mocks/Unity/Application/ApplicationManager.cpp+3−3
@@ -361,9 +361,9 @@ void ApplicationManager::buildListOfAvailableApplications()
361 ApplicationInfo *application;
361 ApplicationInfo *application;
362
362
363 application = new ApplicationInfo(this);
363 application = new ApplicationInfo(this);
364− application->setAppId("phone-app");
364+ application->setAppId("dialer-app");
365− application->setName("Phone");
365+ application->setName("Dialer");
366− application->setIcon(QUrl("phone"));
366+ application->setIcon(QUrl("dialer"));
367 application->setStage(ApplicationInfo::SideStage);
367 application->setStage(ApplicationInfo::SideStage);
368 application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
368 application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
369 generateQmlStrings(application);
369 generateQmlStrings(application);
tests/mocks/Unity/Launcher/MockLauncherModel.cpp+1−1
@@ -22,7 +22,7 @@
22
22
23MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(parent)
23MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(parent)
24{
24{
25− MockLauncherItem *item = new MockLauncherItem("phone-app", "/usr/share/applications/phone-app.desktop", "Phone", "phone-app", this);
25+ MockLauncherItem *item = new MockLauncherItem("dialer-app", "/usr/share/applications/dialer-app.desktop", "Dialer", "dialer-app", this);
26 item->setProgress(0);
26 item->setProgress(0);
27 m_list.append(item);
27 m_list.append(item);
28 item->setFocused(true);
28 item->setFocused(true);
tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml+2−2
@@ -30,7 +30,7 @@ Rectangle {
30 ApplicationManager.stopApplication(ApplicationManager.get(0).appId)
30 ApplicationManager.stopApplication(ApplicationManager.get(0).appId)
31 }
31 }
32
32
33− ApplicationManager.startApplication("phone-app");
33+ ApplicationManager.startApplication("dialer-app");
34 ApplicationManager.startApplication("webbrowser-app");
34 ApplicationManager.startApplication("webbrowser-app");
35 }
35 }
36
36
@@ -70,7 +70,7 @@ Rectangle {
70 verify(browserTile != undefined)
70 verify(browserTile != undefined)
71 browserTile.onPressAndHold.connect(onBrowserLongPressed)
71 browserTile.onPressAndHold.connect(onBrowserLongPressed)
72
72
73− phoneTile = findChild(runningApplicationsGrid, "runningAppTile Phone")
73+ phoneTile = findChild(runningApplicationsGrid, "runningAppTile Dialer")
74 verify(phoneTile != undefined)
74 verify(phoneTile != undefined)
75 phoneTile.onPressAndHold.connect(onPhoneLongPressed)
75 phoneTile.onPressAndHold.connect(onPhoneLongPressed)
76
76
tests/qmltests/Launcher/tst_Launcher.qml+2−2
@@ -115,7 +115,7 @@ Item {
115 /* If I click on the icon of an application on the launcher
115 /* If I click on the icon of an application on the launcher
116 Launcher::launcherApplicationSelected signal should be emitted with the
116 Launcher::launcherApplicationSelected signal should be emitted with the
117 corresponding desktop file. E.g. clicking on phone icon should yield
117 corresponding desktop file. E.g. clicking on phone icon should yield
118− launcherApplicationSelected("[...]phone-app.desktop") */
118+ launcherApplicationSelected("[...]dialer-app.desktop") */
119 function test_clickingOnAppIconCausesSignalEmission() {
119 function test_clickingOnAppIconCausesSignalEmission() {
120 launcher.lastSelectedApplication = ""
120 launcher.lastSelectedApplication = ""
121
121
@@ -131,7 +131,7 @@ Item {
131 mouseClick(appIcon, appIcon.width/2, appIcon.height/2)
131 mouseClick(appIcon, appIcon.width/2, appIcon.height/2)
132
132
133 tryCompare(launcher, "lastSelectedApplication",
133 tryCompare(launcher, "lastSelectedApplication",
134− "phone-app")
134+ "dialer-app")
135
135
136 // Tapping on an application icon also dismisses the launcher
136 // Tapping on an application icon also dismisses the launcher
137 revealer.waitUntilLauncherDisappears()
137 revealer.waitUntilLauncherDisappears()
tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml+1−1
@@ -67,7 +67,7 @@ Row {
67 summary: "Incoming call",
67 summary: "Incoming call",
68 body: "Frank Zappa\n+44 (0)7736 027340",
68 body: "Frank Zappa\n+44 (0)7736 027340",
69 icon: "../graphics/avatars/funky.png",
69 icon: "../graphics/avatars/funky.png",
70− secondaryIcon: "../graphics/applicationIcons/phone-app.png",
70+ secondaryIcon: "../graphics/applicationIcons/dialer-app.png",
71 actions: [{ id: "pickup_id", label: "Pick up"},
71 actions: [{ id: "pickup_id", label: "Pick up"},
72 { id: "decline_1_id", label: "Decline"},
72 { id: "decline_1_id", label: "Decline"},
73 { id: "decline_2_id", label: "Can't talk now, what's up?"},
73 { id: "decline_2_id", label: "Can't talk now, what's up?"},