git.iko.soy/unity8
on xenial help sign in
ApplicationInfo->ApplicationInfoInterface
commitbc302959b6730faa29467d5595bceddc5dfc4fd3 authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 27 Aug 2014, 22:39 (12 years ago) parent3ecd374
5 files changed+17−17
compare with xenial
unifiedsplit
qml/Stages/ApplicationWindow.qml+3−3 tests/qmltests/Panel/tst_ActiveCallHint.qml+1−1 tests/qmltests/Stages/tst_ApplicationWindow.qml+9−9 tests/qmltests/Stages/tst_PhoneStage.qml+1−1 tests/qmltests/tst_Shell.qml+3−3
qml/Stages/ApplicationWindow.qml+3−3
@@ -42,7 +42,7 @@ SessionContainer {
4242
4343 property bool needToTakeScreenshot:
4444 root.surface && d.surfaceInitialized && screenshotImage.status === Image.Null
45− && d.applicationState === ApplicationInfo.Stopped
45+ && d.applicationState === ApplicationInfoInterface.Stopped
4646 onNeedToTakeScreenshotChanged: {
4747 if (needToTakeScreenshot) {
4848 screenshotImage.take();
@@ -133,7 +133,7 @@ SessionContainer {
133133 when:
134134 (root.surface && d.surfaceInitialized)
135135 &&
136− (d.applicationState !== ApplicationInfo.Stopped
136+ (d.applicationState !== ApplicationInfoInterface.Stopped
137137 || screenshotImage.status !== Image.Ready)
138138 },
139139 State {
@@ -141,7 +141,7 @@ SessionContainer {
141141 when:
142142 screenshotImage.status === Image.Ready
143143 &&
144− (d.applicationState === ApplicationInfo.Stopped
144+ (d.applicationState === ApplicationInfoInterface.Stopped
145145 || !root.surface || !d.surfaceInitialized)
146146 }
147147 ]
tests/qmltests/Panel/tst_ActiveCallHint.qml+1−1
@@ -97,7 +97,7 @@ Item {
9797 var application = ApplicationManager.startApplication("dialer-app");
9898 ApplicationManager.focusApplication("dialer-app");
9999 tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");
100− tryCompare(application, "state", ApplicationInfo.Running);
100+ tryCompare(application, "state", ApplicationInfoInterface.Running);
101101
102102 if (!data.focused) { ApplicationManager.unfocusCurrentApplication(); }
103103 }
tests/qmltests/Stages/tst_ApplicationWindow.qml+9−9
@@ -32,7 +32,7 @@ Rectangle {
3232 Component.onCompleted: {
3333 root.fakeApplication = ApplicationManager.add("gallery-app");
3434 root.fakeApplication.manualSessionCreation = true;
35− root.fakeApplication.setState(ApplicationInfo.Starting);
35+ root.fakeApplication.setState(ApplicationInfoInterface.Starting);
3636 }
3737 property QtObject fakeApplication: null
3838 readonly property var fakeSession: fakeApplication ? fakeApplication.session : null
@@ -103,13 +103,13 @@ Rectangle {
103103 "Stopped"]
104104 property int selectedApplicationState: {
105105 if (model[selectedIndex] === "Starting") {
106− return ApplicationInfo.Starting;
106+ return ApplicationInfoInterface.Starting;
107107 } else if (model[selectedIndex] === "Running") {
108− return ApplicationInfo.Running;
108+ return ApplicationInfoInterface.Running;
109109 } else if (model[selectedIndex] === "Suspended") {
110− return ApplicationInfo.Suspended;
110+ return ApplicationInfoInterface.Suspended;
111111 } else {
112− return ApplicationInfo.Stopped;
112+ return ApplicationInfoInterface.Stopped;
113113 }
114114 }
115115 onSelectedApplicationStateChanged: {
@@ -126,10 +126,10 @@ Rectangle {
126126 when: windowShown
127127
128128 // just to make them shorter
129− property int appStarting: ApplicationInfo.Starting
130− property int appRunning: ApplicationInfo.Running
131− property int appSuspended: ApplicationInfo.Suspended
132− property int appStopped: ApplicationInfo.Stopped
129+ property int appStarting: ApplicationInfoInterface.Starting
130+ property int appRunning: ApplicationInfoInterface.Running
131+ property int appSuspended: ApplicationInfoInterface.Suspended
132+ property int appStopped: ApplicationInfoInterface.Stopped
133133
134134 function setApplicationState(appState) {
135135 switch (appState) {
tests/qmltests/Stages/tst_PhoneStage.qml+1−1
@@ -64,7 +64,7 @@ Item {
6464 anchors { left: parent.left; right: parent.right }
6565 text: "Stop Selected"
6666 onClicked: {
67− ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfo.Stopped);
67+ ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfoInterface.Stopped);
6868 }
6969 }
7070 }
tests/qmltests/tst_Shell.qml+3−3
@@ -144,7 +144,7 @@ Item {
144144 verify(mainAppId != "");
145145 var mainApp = ApplicationManager.findApplication(mainAppId);
146146 verify(mainApp);
147− tryCompare(mainApp, "state", ApplicationInfo.Running);
147+ tryCompare(mainApp, "state", ApplicationInfoInterface.Running);
148148
149149 // Try to suspend while proximity is engaged...
150150 Powerd.displayPowerStateChange(Powerd.Off, Powerd.Proximity);
@@ -157,7 +157,7 @@ Item {
157157 tryCompare(greeter, "showProgress", 1);
158158
159159 tryCompare(ApplicationManager, "suspended", true);
160− compare(mainApp.state, ApplicationInfo.Suspended);
160+ compare(mainApp.state, ApplicationInfoInterface.Suspended);
161161
162162 // And wake up
163163 Powerd.displayPowerStateChange(Powerd.On, 0);
@@ -166,7 +166,7 @@ Item {
166166 // Swipe away greeter to focus app
167167 swipeAwayGreeter();
168168 tryCompare(ApplicationManager, "suspended", false);
169− compare(mainApp.state, ApplicationInfo.Running);
169+ compare(mainApp.state, ApplicationInfoInterface.Running);
170170 tryCompare(ApplicationManager, "focusedApplicationId", mainAppId);
171171 }
172172