git.iko.soy/unity8
on xenial help sign in
Merge
commitec46807de74c161e54cccb8c9317fa63c83eebd3 authorAlbert Astals Cid <albert.astals@canonical.com> dateMon 17 Aug 2015, 10:09 (11 years ago) parent16146caae9d4d8
5 files changed+25−17
compare with xenial
unifiedsplit
debian/changelog+17 plugins/Ubuntu/Payments/Payments.cpp−2 plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+2−11 tests/qmltests/Stages/tst_PhoneStage.qml+1 tests/qmltests/tst_ShellWithPin.qml+5−4
debian/changelog+17
@@ -1,3 +1,20 @@
1+unity8 (8.11+15.04.20150814-0ubuntu1) vivid; urgency=medium
2+
3+ [ Albert Astals Cid ]
4+ * Make the test pass again after rework of appmanager
5+ * fix testPhoneStage
6+
7+ [ CI Train Bot ]
8+ * New rebuild forced.
9+
10+ [ Daniel d'Andrada ]
11+ * Fix and clean up InputInfo plugin
12+
13+ [ Rodney Dawes ]
14+ * Do not call verify in the payments button code. (LP: #1468038)
15+
16+ -- CI Train Bot <ci-train-bot@canonical.com> Fri, 14 Aug 2015 09:53:11 +0000
17+
118unity8 (8.11+15.04.20150812-0ubuntu1) vivid; urgency=medium
219
320 [ Albert Astals Cid ]
plugins/Ubuntu/Payments/Payments.cpp−2
@@ -123,8 +123,6 @@ void Payments::setStoreItemId(const QString &store_item_id)
123123 if (m_store_item_id.isEmpty()) {
124124 return;
125125 }
126−
127− pay_package_item_start_verification(m_package, m_store_item_id.toLocal8Bit().data());
128126}
129127
130128void Payments::setPurchasing(bool is_purchasing)
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+2−11
@@ -101,8 +101,6 @@ void QInputDeviceInfoPrivate::init()
101101 if (!iDevice)
102102 continue;
103103
104− qDebug() << "*** ADDING DEVICE" << eventPath;
105−
106104 iDevice->setTypes(getInputTypes(dev));
107105
108106 if (iDevice->switches().count() > 0 && iDevice->buttons().count() == 0)
@@ -125,12 +123,6 @@ void QInputDeviceInfoPrivate::init()
125123
126124QInputDeviceInfo::InputTypes QInputDeviceInfoPrivate::getInputTypes( struct udev_device *dev)
127125{
128− qDebug() << "******* have input type Keyboard" << udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD");
129− qDebug() << "******* have input type Mouse" << udev_device_get_property_value(dev, "ID_INPUT_MOUSE");
130− qDebug() << "******* have input type Touchpad" << udev_device_get_property_value(dev, "ID_INPUT_TOUCHPAD");
131− qDebug() << "******* have input type Touchscreen" << udev_device_get_property_value(dev, "ID_INPUT_TOUCHSCREEN");
132− qDebug() << "******* have input type Tablet" << udev_device_get_property_value(dev, "ID_INPUT_TABLET");
133− qDebug() << "******* have input type joystick" << udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK");
134126 QInputDeviceInfo::InputTypes types = QInputDeviceInfo::Unknown;
135127 if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD"), "1") == 0 )
136128 types |= QInputDeviceInfo::Keyboard;
@@ -151,6 +143,7 @@ QInputDeviceInfo::InputTypes QInputDeviceInfoPrivate::getInputTypes( struct udev
151143QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)
152144{
153145 QInputDevice *inputDevice = new QInputDevice(this);
146+ inputDevice->setDevicePath(path);
154147
155148 struct libevdev *dev = NULL;
156149 int fd;
@@ -158,17 +151,15 @@ QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)
158151 fd = open(path.toLatin1(), O_RDONLY|O_NONBLOCK);
159152
160153 if (fd == -1) {
161− qDebug() << "Failed to open";
162154 return inputDevice;
163155 }
164156 rc = libevdev_new_from_fd(fd, &dev);
165157 if (rc < 0) {
166− qDebug() << "Failed to init libevdev ("<< strerror(-rc) << ")";
158+ qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";
167159 return inputDevice;
168160 }
169161
170162 inputDevice->setName(QString::fromLatin1(libevdev_get_name(dev)));
171− inputDevice->setDevicePath(path);
172163 for (int i = 0; i < EV_MAX; i++) {
173164 if (i == EV_KEY || i == EV_SW || i == EV_REL
174165 || i == EV_REL || i == EV_ABS) {
tests/qmltests/Stages/tst_PhoneStage.qml+1
@@ -295,6 +295,7 @@ Item {
295295 tryCompare(ApplicationManager, "count", oldCount - 1)
296296 }
297297 phoneStage.shellOrientationAngle = 0;
298+ phoneStage.select(ApplicationManager.get(0).appId);
298299 }
299300
300301 function test_focusNewTopMostAppAfterFocusedOneClosesItself() {
tests/qmltests/tst_ShellWithPin.qml+5−4
@@ -498,12 +498,13 @@ Item {
498498
499499 function test_suspend() {
500500 var greeter = findChild(shell, "greeter");
501+ var applicationsDisplayLoader = findChild(shell, "applicationsDisplayLoader")
501502
502503 // Put it to sleep
503504 Powerd.status = Powerd.Off;
504505
505− // If locked, ApplicationManager.suspended should be true
506− tryCompare(ApplicationManager, "suspended", true);
506+ // If locked, applicationsDisplayLoader.item.suspended should be true
507+ tryCompare(applicationsDisplayLoader.item, "suspended", true);
507508
508509 // And wake up
509510 Powerd.status = Powerd.On;
@@ -513,12 +514,12 @@ Item {
513514 swipeAwayGreeter(true);
514515
515516 // We have a lockscreen, make sure we're still suspended
516− tryCompare(ApplicationManager, "suspended", true);
517+ tryCompare(applicationsDisplayLoader.item, "suspended", true);
517518
518519 enterPin("1234")
519520
520521 // Now that the lockscreen has gone too, make sure we're waking up
521− tryCompare(ApplicationManager, "suspended", false);
522+ tryCompare(applicationsDisplayLoader.item, "suspended", false);
522523
523524 }
524525