3e02e0c · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Replace webbrowser-app with morph-browser

3e02e0cDalton Durst8 years ago

data/com.canonical.Unity.gschema.xml+1−1

compare with xenial

unifiedsplit

@@ -164,7 +164,7 @@

164 'appid://openstore.openstore-team/openstore/current-user-version',

165 'appid://com.ubuntu.camera/camera/current-user-version',

166 'appid://com.ubuntu.gallery/gallery/current-user-version',

167− 'application:///webbrowser-app.desktop'

167+ 'application:///morph-browser.desktop'

168 ]</default>

169 <summary>List of items that should be shown by default in the launcher</summary>

170 <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):

90 self.shell_proxy = unity_with_sensors.main_win.select_single('Shell')

92 # launch an application

93− self.launch_upstart_application('webbrowser-app')

93+ self.launch_upstart_application('morph-browser')

94 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')

97 # skip test early, if device doesn't support a certain orientation

98 if not (self.shell_proxy.orientation & o_proxy.supportedOrientations):

@@ -100,7 +100,7 @@ class TestRotationWithApp(RotationBase):

100

101 self.assertThat(

102 unity_with_sensors.main_win.get_current_focused_app_id(),

103− Eventually(Equals('webbrowser-app')))

103+ Eventually(Equals('morph-browser')))

104

105 # get default orientation and angle

106 self.orientation = self.shell_proxy.orientation

tests/mocks/Unity/Application/ApplicationManager.cpp+1−1

@@ -371,7 +371,7 @@ void ApplicationManager::buildListOfAvailableApplications()

371 m_availableApplications.append(application);

372

373 application = new ApplicationInfo(this);

374− application->setAppId("webbrowser-app");

374+ application->setAppId("morph-browser");

375 application->setShellChrome(Mir::LowChrome);

376 application->setName("Browser");

377 application->setScreenshotId("browser");

tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js+3−3

@@ -879,7 +879,7 @@ var fakeMenuData = {

879 "ext": {

880 "xCanonicalUid": 1003

881 },

882− "icon": "image://theme/webbrowser-app",

882+ "icon": "image://theme/morph-browser",

883 "isCheck": false,

884 "isRadio": false,

885 "isSeparator": false,

@@ -928,7 +928,7 @@ var fakeMenuData = {

928 "ext": {

929 "xCanonicalUid": 1002

930 },

931− "icon": "image://theme/webbrowser-app",

931+ "icon": "image://theme/morph-browser",

932 "isCheck": false,

933 "isRadio": false,

934 "isSeparator": false,

@@ -945,7 +945,7 @@ var fakeMenuData = {

945 "ext": {

946 "xCanonicalUid": 1001

947 },

948− "icon": "image://theme/webbrowser-app",

948+ "icon": "image://theme/morph-browser",

949 "isCheck": false,

950 "isRadio": false,

951 "isSeparator": false,

tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp+1−1

@@ -34,7 +34,7 @@ MockAppDrawerModel::MockAppDrawerModel(QObject *parent):

34 m_list.append(item);

35 item = new MockLauncherItem("facebook-webapp", "/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook", this);

36 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);

38 m_list.append(item);

39 item = new MockLauncherItem("twitter-webapp", "/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter", this);

40 m_list.append(item);

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+1−1

@@ -51,7 +51,7 @@ MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(pa

51 item = new MockLauncherItem("facebook-webapp", "/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook", this);

52 item->setProgress(150);

53 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);

55 item->setSurfaceCount(5);

56 item->setCount(1);

57 item->setCountVisible(true);

tests/qmltests/Stage/tst_PhoneStage.qml+6−6

@@ -432,7 +432,7 @@ Item {

432

433 function test_closeSurfaceOfMultiSurfaceApp() {

434 var surface1Id = topLevelSurfaceList.nextId;

435− var webbrowserApp = ApplicationManager.startApplication("webbrowser-app");

435+ var webbrowserApp = ApplicationManager.startApplication("morph-browser");

436 waitUntilAppSurfaceShowsUp(surface1Id);

437

438 var surface2Id = topLevelSurfaceList.nextId;

@@ -465,7 +465,7 @@ Item {

465

466 function test_swipeToClose(data) {

467 var surface1Id = topLevelSurfaceList.nextId;

468− var webbrowserApp = ApplicationManager.startApplication("webbrowser-app");

468+ var webbrowserApp = ApplicationManager.startApplication("morph-browser");

469 waitUntilAppSurfaceShowsUp(surface1Id);

470

471 performEdgeSwipeToShowAppSpread();

@@ -497,7 +497,7 @@ Item {

497 var dashWindow = topLevelSurfaceList.windowAt(0);

498

499 var webbrowserSurfaceId = topLevelSurfaceList.nextId;

500− var webbrowserApp = ApplicationManager.startApplication("webbrowser-app");

500+ var webbrowserApp = ApplicationManager.startApplication("morph-browser");

501 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);

502

503 switchToSurface(dashSurfaceId);

@@ -541,7 +541,7 @@ Item {

541 var dashWindow = topLevelSurfaceList.windowAt(0);

542

543 var webbrowserSurfaceId = topLevelSurfaceList.nextId;

544− var webbrowserApp = ApplicationManager.startApplication("webbrowser-app");

544+ var webbrowserApp = ApplicationManager.startApplication("morph-browser");

545 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);

546

547 switchToSurface(dashSurfaceId);

@@ -571,7 +571,7 @@ Item {

571 tryCompareFunction(function(){return topLevelSurfaceList.indexForId(webbrowserSurfaceId);}, -1);

572

573 // nor is its app

574− compare(ApplicationManager.findApplication("webbrowser-app"), null);

574+ compare(ApplicationManager.findApplication("morph-browser"), null);

575

576 // only unity8-dash surface is left

577 compare(topLevelSurfaceList.count, 1);

@@ -587,7 +587,7 @@ Item {

587 performEdgeSwipeToShowAppSpread();

588

589 var webbrowserSurfaceId = topLevelSurfaceList.nextId;

590− var webbrowserApp = ApplicationManager.startApplication("webbrowser-app");

590+ var webbrowserApp = ApplicationManager.startApplication("morph-browser");

591 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);

592

593 compare(topLevelSurfaceList.idAt(0), webbrowserSurfaceId);

tests/qmltests/Stage/tst_TabletStage.qml+5−5

@@ -110,7 +110,7 @@ Rectangle {

110

111 ApplicationCheckBox {

112 id: webbrowserCheckBox

113− appId: "webbrowser-app"

113+ appId: "morph-browser"

114 }

115 ApplicationCheckBox {

116 id: galleryCheckBox

@@ -519,7 +519,7 @@ Rectangle {

519

520 function test_applicationLoadsInDefaultStage_data() {

521 return [

522− { tag: "MainStage", appId: "webbrowser-app", mainStageAppId: "webbrowser-app", sideStageAppId: "" },

522+ { tag: "MainStage", appId: "morph-browser", mainStageAppId: "morph-browser", sideStageAppId: "" },

523 { tag: "SideStage", appId: "dialer-app", mainStageAppId: "unity8-dash", sideStageAppId: "dialer-app" },

524 ];

525 }

@@ -541,8 +541,8 @@ Rectangle {

541

542 function test_applicationLoadsInSavedStage_data() {

543 return [

544− { tag: "MainStage", stage: ApplicationInfoInterface.MainStage, mainStageAppId: "webbrowser-app", sideStageAppId: ""},

544+ { tag: "MainStage", stage: ApplicationInfoInterface.MainStage, mainStageAppId: "morph-browser", sideStageAppId: ""},

545− { tag: "SideStage", stage: ApplicationInfoInterface.SideStage, mainStageAppId: "unity8-dash", sideStageAppId: "webbrowser-app" },

545+ { tag: "SideStage", stage: ApplicationInfoInterface.SideStage, mainStageAppId: "unity8-dash", sideStageAppId: "morph-browser" },

546 ];

547 }

548

@@ -591,7 +591,7 @@ Rectangle {

591 }

592

593 tryCompare(stageSaver, "count", 1);

594− compare(stageSaver.signalArguments[0][0], "webbrowser-app")

594+ compare(stageSaver.signalArguments[0][0], "morph-browser")

595 compare(stageSaver.signalArguments[0][1], data.toStage)

596 }

597

tests/qmltests/tst_Shell.qml+8−8

@@ -607,7 +607,7 @@ Rectangle {

607 waitForRendering(shell)

608 var app0 = ApplicationManager.startApplication("unity8-dash")

609 var app1 = ApplicationManager.startApplication("dialer-app")

610− var app2 = ApplicationManager.startApplication("webbrowser-app")

610+ var app2 = ApplicationManager.startApplication("morph-browser")

611 var app3 = ApplicationManager.startApplication("camera-app")

612 var app4 = ApplicationManager.startApplication("facebook-webapp")

613 var app5 = ApplicationManager.startApplication("camera-app")

@@ -961,7 +961,7 @@ Rectangle {

961 shell.usageScenario = data.usageScenario;

962 swipeAwayGreeter();

963

964− var appDelegate = startApplication("webbrowser-app");

964+ var appDelegate = startApplication("morph-browser");

965

966 tryCompare(appDelegate.surface, "activeFocus", true);

967 }

@@ -971,7 +971,7 @@ Rectangle {

971 swipeAwayGreeter();

972

973 var webAppSurfaceId = topLevelSurfaceList.nextId;

974− var webApp = ApplicationManager.startApplication("webbrowser-app");

974+ var webApp = ApplicationManager.startApplication("morph-browser");

975 verify(webApp);

976 waitUntilAppWindowIsFullyLoaded(webAppSurfaceId);

977

@@ -1522,7 +1522,7 @@ Rectangle {

1522 waitUntilAppWindowIsFullyLoaded(appSurfaceId);

1523

1524 var webBrowserSurfaceId = topLevelSurfaceList.nextId;

1525− var webBrowserApp = ApplicationManager.startApplication("webbrowser-app");

1525+ var webBrowserApp = ApplicationManager.startApplication("morph-browser");

1526 waitUntilAppWindowIsFullyLoaded(webBrowserSurfaceId);

1527

1528 var gallerySurfaceId = topLevelSurfaceList.nextId;

@@ -1550,7 +1550,7 @@ Rectangle {

1550 waitUntilAppWindowIsFullyLoaded(appSurfaceId);

1551

1552 var webBrowserSurfaceId = topLevelSurfaceList.nextId;

1553− var webBrowserApp = ApplicationManager.startApplication("webbrowser-app");

1553+ var webBrowserApp = ApplicationManager.startApplication("morph-browser");

1554 waitUntilAppWindowIsFullyLoaded(webBrowserSurfaceId);

1555

1556 var gallerySurfaceId = topLevelSurfaceList.nextId;

@@ -1590,7 +1590,7 @@ Rectangle {

1590 waitUntilAppWindowIsFullyLoaded(app1SurfaceId);

1591

1592 var app2SurfaceId = topLevelSurfaceList.nextId;

1593− var app2 = ApplicationManager.startApplication("webbrowser-app")

1593+ var app2 = ApplicationManager.startApplication("morph-browser")

1594 waitUntilAppWindowIsFullyLoaded(app2SurfaceId);

1595 var app2Surface = app2.surfaceList.get(0);

1596 verify(app2Surface);

@@ -2088,11 +2088,11 @@ Rectangle {

2088 loadShell(data.formFactor);

2089 shell.usageScenario = data.usageScenario;

2090

2091− GSettingsController.setLifecycleExemptAppids(["webbrowser-app"]);

2091+ GSettingsController.setLifecycleExemptAppids(["morph-browser"]);

2092

2093 // Add two main stage apps, the second in order to suspend the first

2094 var app1SurfaceId = topLevelSurfaceList.nextId;

2095− var app1 = ApplicationManager.startApplication("webbrowser-app");

2095+ var app1 = ApplicationManager.startApplication("morph-browser");

2096 waitUntilAppWindowIsFullyLoaded(app1SurfaceId);

2097 var app2SurfaceId = topLevelSurfaceList.nextId;

2098 var app2 = ApplicationManager.startApplication("gallery-app");