@@ -57,10 +57,6 @@ Item {
5757 }
5858
5959 property real panelAndSeparatorHeight: panel.indicators.panelHeight + units.dp(2)
60−
61− Component.onCompleted: {
62− callManager.foregroundCall = phoneCall;
63− }
6460 }
6561
6662
@@ -110,10 +106,10 @@ Item {
110106 width: parent.width/3
111107
112108 onClicked: {
113− if (callManager.callIndicatorVisible) {
114− callManager.callIndicatorVisible = false;
109+ if (callManager.foregroundCall) {
110+ callManager.foregroundCall = null;
115111 } else {
116− callManager.callIndicatorVisible = true;
112+ callManager.foregroundCall = phoneCall;
117113 }
118114 }
119115 }
@@ -136,7 +132,7 @@ Item {
136132 panel.indicators.hide();
137133 // Wait for animation to complete
138134 tryCompare(panel.indicators.hideAnimation, "running", false);
139− callManager.callIndicatorVisible = false;
135+ callManager.foregroundCall = null;
140136
141137 // Wait for the indicators to get into position.
142138 // (switches between normal and fullscreen modes are animated)
@@ -207,7 +203,7 @@ Item {
207203 // Pressing on the top edge of the indicator should have no effect if the panel
208204 // has an active call
209205 function test_noHintOnActiveCall() {
210− callManager.callIndicatorVisible = true;
206+ callManager.foregroundCall = phoneCall;
211207
212208 var indicatorItemCoord = get_indicator_item_position(0);
213209
@@ -228,17 +224,17 @@ Item {
228224
229225 function test_drag_show_data() {
230226 return [
231− { tag: "pinned", fullscreenFlag: false, alreadyOpen: false, call: false,
227+ { tag: "pinned", fullscreenFlag: false, alreadyOpen: false, call: null,
232228 indicatorY: 0 },
233− { tag: "fullscreen", fullscreenFlag: true, alreadyOpen: false, call: false,
229+ { tag: "fullscreen", fullscreenFlag: true, alreadyOpen: false, call: null,
234230 indicatorY: -panel.panelAndSeparatorHeight },
235− { tag: "pinned-alreadyOpen", fullscreenFlag: false, alreadyOpen: true, call: false,
231+ { tag: "pinned-alreadyOpen", fullscreenFlag: false, alreadyOpen: true, call: null,
236232 indicatorY: 0 },
237− { tag: "fullscreen-alreadyOpen", fullscreenFlag: true, alreadyOpen: true, call: false,
233+ { tag: "fullscreen-alreadyOpen", fullscreenFlag: true, alreadyOpen: true, call: null,
238234 indicatorY: 0 },
239− { tag: "pinned-callActive", fullscreenFlag: false, alreadyOpen: false, call: true,
235+ { tag: "pinned-callActive", fullscreenFlag: false, alreadyOpen: false, call: phoneCall,
240236 indicatorY: 0},
241− { tag: "fullscreen-callActive", fullscreenFlag: true, alreadyOpen: false, call: true,
237+ { tag: "fullscreen-callActive", fullscreenFlag: true, alreadyOpen: false, call: phoneCall,
242238 indicatorY: -panel.panelAndSeparatorHeight }
243239 ];
244240 }
@@ -248,7 +244,7 @@ Item {
248244 // expose more of the panel, binding it to the selected indicator and opening it's menu.
249245 function test_drag_show(data) {
250246 panel.fullscreenMode = data.fullscreenFlag;
251− callManager.callIndicatorVisible = data.call;
247+ callManager.foregroundCall = data.call;
252248
253249 if (data.alreadyOpen) {
254250 panel.indicators.show();