git.iko.soy/unity8
on xenial help sign in
Replace webbrowser-app with morph-browser
commit3e02e0c8d24a27475b6938c7d77845ed2f67b53c authorDalton Durst <d@ltondur.st> dateMon 8 Apr 2019, 18:19 (8 years ago) parent5f7cccc
9 files changed+29−29
compare with xenial
unifiedsplit
data/com.canonical.Unity.gschema.xml+1−1 tests/autopilot/unity8/shell/tests/test_rotation.py+3−3 tests/mocks/Unity/Application/ApplicationManager.cpp+1−1 tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js+3−3 tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp+1−1 tests/mocks/Unity/Launcher/MockLauncherModel.cpp+1−1 tests/qmltests/Stage/tst_PhoneStage.qml+6−6 tests/qmltests/Stage/tst_TabletStage.qml+5−5 tests/qmltests/tst_Shell.qml+8−8
data/com.canonical.Unity.gschema.xml+1−1
@@ -164,7 +164,7 @@
164164 'appid://openstore.openstore-team/openstore/current-user-version',
165165 'appid://com.ubuntu.camera/camera/current-user-version',
166166 'appid://com.ubuntu.gallery/gallery/current-user-version',
167− 'application:///webbrowser-app.desktop'
167+ 'application:///morph-browser.desktop'
168168 ]</default>
169169 <summary>List of items that should be shown by default in the launcher</summary>
170170 <description>These items can be: application:///desktop-id.desktop or appid://package/app/current-user-version.</description>
tests/autopilot/unity8/shell/tests/test_rotation.py+3−3
@@ -90,9 +90,9 @@ class TestRotationWithApp(RotationBase):
9090 self.shell_proxy = unity_with_sensors.main_win.select_single('Shell')
9191
9292 # launch an application
93− self.launch_upstart_application('webbrowser-app')
93+ self.launch_upstart_application('morph-browser')
9494 unity_with_sensors.main_win.show_dash_from_launcher()
95− unity_with_sensors.main_win.launch_application('webbrowser-app')
95+ unity_with_sensors.main_win.launch_application('morph-browser')
9696
9797 # skip test early, if device doesn't support a certain orientation
9898 if not (self.shell_proxy.orientation & o_proxy.supportedOrientations):
@@ -100,7 +100,7 @@ class TestRotationWithApp(RotationBase):
100100
101101 self.assertThat(
102102 unity_with_sensors.main_win.get_current_focused_app_id(),
103− Eventually(Equals('webbrowser-app')))
103+ Eventually(Equals('morph-browser')))
104104
105105 # get default orientation and angle
106106 self.orientation = self.shell_proxy.orientation
tests/mocks/Unity/Application/ApplicationManager.cpp+1−1
@@ -371,7 +371,7 @@ void ApplicationManager::buildListOfAvailableApplications()
371371 m_availableApplications.append(application);
372372
373373 application = new ApplicationInfo(this);
374− application->setAppId("webbrowser-app");
374+ application->setAppId("morph-browser");
375375 application->setShellChrome(Mir::LowChrome);
376376 application->setName("Browser");
377377 application->setScreenshotId("browser");
tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js+3−3
@@ -879,7 +879,7 @@ var fakeMenuData = {
879879 "ext": {
880880 "xCanonicalUid": 1003
881881 },
882− "icon": "image://theme/webbrowser-app",
882+ "icon": "image://theme/morph-browser",
883883 "isCheck": false,
884884 "isRadio": false,
885885 "isSeparator": false,
@@ -928,7 +928,7 @@ var fakeMenuData = {
928928 "ext": {
929929 "xCanonicalUid": 1002
930930 },
931− "icon": "image://theme/webbrowser-app",
931+ "icon": "image://theme/morph-browser",
932932 "isCheck": false,
933933 "isRadio": false,
934934 "isSeparator": false,
@@ -945,7 +945,7 @@ var fakeMenuData = {
945945 "ext": {
946946 "xCanonicalUid": 1001
947947 },
948− "icon": "image://theme/webbrowser-app",
948+ "icon": "image://theme/morph-browser",
949949 "isCheck": false,
950950 "isRadio": false,
951951 "isSeparator": false,
tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp+1−1
@@ -34,7 +34,7 @@ MockAppDrawerModel::MockAppDrawerModel(QObject *parent):
3434 m_list.append(item);
3535 item = new MockLauncherItem("facebook-webapp", "/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook", this);
3636 m_list.append(item);
37− item = new MockLauncherItem("webbrowser-app", "/usr/share/applications/webbrowser-app.desktop", "Browser", "browser", this);
37+ item = new MockLauncherItem("morph-browser", "/usr/share/applications/morph-browser.desktop", "Browser", "browser", this);
3838 m_list.append(item);
3939 item = new MockLauncherItem("twitter-webapp", "/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter", this);
4040 m_list.append(item);
tests/mocks/Unity/Launcher/MockLauncherModel.cpp+1−1
@@ -51,7 +51,7 @@ MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(pa
5151 item = new MockLauncherItem("facebook-webapp", "/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook", this);
5252 item->setProgress(150);
5353 m_list.append(item);
54− item = new MockLauncherItem("webbrowser-app", "/usr/share/applications/webbrowser-app.desktop", "Browser", "browser", this);
54+ item = new MockLauncherItem("morph-browser", "/usr/share/applications/morph-browser.desktop", "Browser", "browser", this);
5555 item->setSurfaceCount(5);
5656 item->setCount(1);
5757 item->setCountVisible(true);
tests/qmltests/Stage/tst_PhoneStage.qml+6−6
@@ -432,7 +432,7 @@ Item {
432432
433433 function test_closeSurfaceOfMultiSurfaceApp() {
434434 var surface1Id = topLevelSurfaceList.nextId;
435− var webbrowserApp = ApplicationManager.startApplication("webbrowser-app");
435+ var webbrowserApp = ApplicationManager.startApplication("morph-browser");
436436 waitUntilAppSurfaceShowsUp(surface1Id);
437437
438438 var surface2Id = topLevelSurfaceList.nextId;
@@ -465,7 +465,7 @@ Item {
465465
466466 function test_swipeToClose(data) {
467467 var surface1Id = topLevelSurfaceList.nextId;
468− var webbrowserApp = ApplicationManager.startApplication("webbrowser-app");
468+ var webbrowserApp = ApplicationManager.startApplication("morph-browser");
469469 waitUntilAppSurfaceShowsUp(surface1Id);
470470
471471 performEdgeSwipeToShowAppSpread();
@@ -497,7 +497,7 @@ Item {
497497 var dashWindow = topLevelSurfaceList.windowAt(0);
498498
499499 var webbrowserSurfaceId = topLevelSurfaceList.nextId;
500− var webbrowserApp = ApplicationManager.startApplication("webbrowser-app");
500+ var webbrowserApp = ApplicationManager.startApplication("morph-browser");
501501 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
502502
503503 switchToSurface(dashSurfaceId);
@@ -541,7 +541,7 @@ Item {
541541 var dashWindow = topLevelSurfaceList.windowAt(0);
542542
543543 var webbrowserSurfaceId = topLevelSurfaceList.nextId;
544− var webbrowserApp = ApplicationManager.startApplication("webbrowser-app");
544+ var webbrowserApp = ApplicationManager.startApplication("morph-browser");
545545 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
546546
547547 switchToSurface(dashSurfaceId);
@@ -571,7 +571,7 @@ Item {
571571 tryCompareFunction(function(){return topLevelSurfaceList.indexForId(webbrowserSurfaceId);}, -1);
572572
573573 // nor is its app
574− compare(ApplicationManager.findApplication("webbrowser-app"), null);
574+ compare(ApplicationManager.findApplication("morph-browser"), null);
575575
576576 // only unity8-dash surface is left
577577 compare(topLevelSurfaceList.count, 1);
@@ -587,7 +587,7 @@ Item {
587587 performEdgeSwipeToShowAppSpread();
588588
589589 var webbrowserSurfaceId = topLevelSurfaceList.nextId;
590− var webbrowserApp = ApplicationManager.startApplication("webbrowser-app");
590+ var webbrowserApp = ApplicationManager.startApplication("morph-browser");
591591 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
592592
593593 compare(topLevelSurfaceList.idAt(0), webbrowserSurfaceId);
tests/qmltests/Stage/tst_TabletStage.qml+5−5
@@ -110,7 +110,7 @@ Rectangle {
110110
111111 ApplicationCheckBox {
112112 id: webbrowserCheckBox
113− appId: "webbrowser-app"
113+ appId: "morph-browser"
114114 }
115115 ApplicationCheckBox {
116116 id: galleryCheckBox
@@ -519,7 +519,7 @@ Rectangle {
519519
520520 function test_applicationLoadsInDefaultStage_data() {
521521 return [
522− { tag: "MainStage", appId: "webbrowser-app", mainStageAppId: "webbrowser-app", sideStageAppId: "" },
522+ { tag: "MainStage", appId: "morph-browser", mainStageAppId: "morph-browser", sideStageAppId: "" },
523523 { tag: "SideStage", appId: "dialer-app", mainStageAppId: "unity8-dash", sideStageAppId: "dialer-app" },
524524 ];
525525 }
@@ -541,8 +541,8 @@ Rectangle {
541541
542542 function test_applicationLoadsInSavedStage_data() {
543543 return [
544− { tag: "MainStage", stage: ApplicationInfoInterface.MainStage, mainStageAppId: "webbrowser-app", sideStageAppId: ""},
545− { tag: "SideStage", stage: ApplicationInfoInterface.SideStage, mainStageAppId: "unity8-dash", sideStageAppId: "webbrowser-app" },
544+ { tag: "MainStage", stage: ApplicationInfoInterface.MainStage, mainStageAppId: "morph-browser", sideStageAppId: ""},
545+ { tag: "SideStage", stage: ApplicationInfoInterface.SideStage, mainStageAppId: "unity8-dash", sideStageAppId: "morph-browser" },
546546 ];
547547 }
548548
@@ -591,7 +591,7 @@ Rectangle {
591591 }
592592
593593 tryCompare(stageSaver, "count", 1);
594− compare(stageSaver.signalArguments[0][0], "webbrowser-app")
594+ compare(stageSaver.signalArguments[0][0], "morph-browser")
595595 compare(stageSaver.signalArguments[0][1], data.toStage)
596596 }
597597
tests/qmltests/tst_Shell.qml+8−8
@@ -607,7 +607,7 @@ Rectangle {
607607 waitForRendering(shell)
608608 var app0 = ApplicationManager.startApplication("unity8-dash")
609609 var app1 = ApplicationManager.startApplication("dialer-app")
610− var app2 = ApplicationManager.startApplication("webbrowser-app")
610+ var app2 = ApplicationManager.startApplication("morph-browser")
611611 var app3 = ApplicationManager.startApplication("camera-app")
612612 var app4 = ApplicationManager.startApplication("facebook-webapp")
613613 var app5 = ApplicationManager.startApplication("camera-app")
@@ -961,7 +961,7 @@ Rectangle {
961961 shell.usageScenario = data.usageScenario;
962962 swipeAwayGreeter();
963963
964− var appDelegate = startApplication("webbrowser-app");
964+ var appDelegate = startApplication("morph-browser");
965965
966966 tryCompare(appDelegate.surface, "activeFocus", true);
967967 }
@@ -971,7 +971,7 @@ Rectangle {
971971 swipeAwayGreeter();
972972
973973 var webAppSurfaceId = topLevelSurfaceList.nextId;
974− var webApp = ApplicationManager.startApplication("webbrowser-app");
974+ var webApp = ApplicationManager.startApplication("morph-browser");
975975 verify(webApp);
976976 waitUntilAppWindowIsFullyLoaded(webAppSurfaceId);
977977
@@ -1522,7 +1522,7 @@ Rectangle {
15221522 waitUntilAppWindowIsFullyLoaded(appSurfaceId);
15231523
15241524 var webBrowserSurfaceId = topLevelSurfaceList.nextId;
1525− var webBrowserApp = ApplicationManager.startApplication("webbrowser-app");
1525+ var webBrowserApp = ApplicationManager.startApplication("morph-browser");
15261526 waitUntilAppWindowIsFullyLoaded(webBrowserSurfaceId);
15271527
15281528 var gallerySurfaceId = topLevelSurfaceList.nextId;
@@ -1550,7 +1550,7 @@ Rectangle {
15501550 waitUntilAppWindowIsFullyLoaded(appSurfaceId);
15511551
15521552 var webBrowserSurfaceId = topLevelSurfaceList.nextId;
1553− var webBrowserApp = ApplicationManager.startApplication("webbrowser-app");
1553+ var webBrowserApp = ApplicationManager.startApplication("morph-browser");
15541554 waitUntilAppWindowIsFullyLoaded(webBrowserSurfaceId);
15551555
15561556 var gallerySurfaceId = topLevelSurfaceList.nextId;
@@ -1590,7 +1590,7 @@ Rectangle {
15901590 waitUntilAppWindowIsFullyLoaded(app1SurfaceId);
15911591
15921592 var app2SurfaceId = topLevelSurfaceList.nextId;
1593− var app2 = ApplicationManager.startApplication("webbrowser-app")
1593+ var app2 = ApplicationManager.startApplication("morph-browser")
15941594 waitUntilAppWindowIsFullyLoaded(app2SurfaceId);
15951595 var app2Surface = app2.surfaceList.get(0);
15961596 verify(app2Surface);
@@ -2088,11 +2088,11 @@ Rectangle {
20882088 loadShell(data.formFactor);
20892089 shell.usageScenario = data.usageScenario;
20902090
2091− GSettingsController.setLifecycleExemptAppids(["webbrowser-app"]);
2091+ GSettingsController.setLifecycleExemptAppids(["morph-browser"]);
20922092
20932093 // Add two main stage apps, the second in order to suspend the first
20942094 var app1SurfaceId = topLevelSurfaceList.nextId;
2095− var app1 = ApplicationManager.startApplication("webbrowser-app");
2095+ var app1 = ApplicationManager.startApplication("morph-browser");
20962096 waitUntilAppWindowIsFullyLoaded(app1SurfaceId);
20972097 var app2SurfaceId = topLevelSurfaceList.nextId;
20982098 var app2 = ApplicationManager.startApplication("gallery-app");