git.iko.soy/unity8
on xenial help sign in
Merge
ec46807Albert Astals Cid
debian/changelog+17
compare with xenial
unifiedsplit
@@ -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+
1unity8 (8.11+15.04.20150812-0ubuntu1) vivid; urgency=medium
18unity8 (8.11+15.04.20150812-0ubuntu1) vivid; urgency=medium
2
19
3 [ Albert Astals Cid ]
20 [ Albert Astals Cid ]
plugins/Ubuntu/Payments/Payments.cpp−2
@@ -123,8 +123,6 @@ void Payments::setStoreItemId(const QString &store_item_id)
123 if (m_store_item_id.isEmpty()) {
123 if (m_store_item_id.isEmpty()) {
124 return;
124 return;
125 }
125 }
126−
127− pay_package_item_start_verification(m_package, m_store_item_id.toLocal8Bit().data());
128}
126}
129
127
130void Payments::setPurchasing(bool is_purchasing)
128void Payments::setPurchasing(bool is_purchasing)
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+2−11
@@ -101,8 +101,6 @@ void QInputDeviceInfoPrivate::init()
101 if (!iDevice)
101 if (!iDevice)
102 continue;
102 continue;
103
103
104− qDebug() << "*** ADDING DEVICE" << eventPath;
105−
106 iDevice->setTypes(getInputTypes(dev));
104 iDevice->setTypes(getInputTypes(dev));
107
105
108 if (iDevice->switches().count() > 0 && iDevice->buttons().count() == 0)
106 if (iDevice->switches().count() > 0 && iDevice->buttons().count() == 0)
@@ -125,12 +123,6 @@ void QInputDeviceInfoPrivate::init()
125
123
126QInputDeviceInfo::InputTypes QInputDeviceInfoPrivate::getInputTypes( struct udev_device *dev)
124QInputDeviceInfo::InputTypes QInputDeviceInfoPrivate::getInputTypes( struct udev_device *dev)
127{
125{
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");
134 QInputDeviceInfo::InputTypes types = QInputDeviceInfo::Unknown;
126 QInputDeviceInfo::InputTypes types = QInputDeviceInfo::Unknown;
135 if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD"), "1") == 0 )
127 if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD"), "1") == 0 )
136 types |= QInputDeviceInfo::Keyboard;
128 types |= QInputDeviceInfo::Keyboard;
@@ -151,6 +143,7 @@ QInputDeviceInfo::InputTypes QInputDeviceInfoPrivate::getInputTypes( struct udev
151QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)
143QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)
152{
144{
153 QInputDevice *inputDevice = new QInputDevice(this);
145 QInputDevice *inputDevice = new QInputDevice(this);
146+ inputDevice->setDevicePath(path);
154
147
155 struct libevdev *dev = NULL;
148 struct libevdev *dev = NULL;
156 int fd;
149 int fd;
@@ -158,17 +151,15 @@ QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)
158 fd = open(path.toLatin1(), O_RDONLY|O_NONBLOCK);
151 fd = open(path.toLatin1(), O_RDONLY|O_NONBLOCK);
159
152
160 if (fd == -1) {
153 if (fd == -1) {
161− qDebug() << "Failed to open";
162 return inputDevice;
154 return inputDevice;
163 }
155 }
164 rc = libevdev_new_from_fd(fd, &dev);
156 rc = libevdev_new_from_fd(fd, &dev);
165 if (rc < 0) {
157 if (rc < 0) {
166− qDebug() << "Failed to init libevdev ("<< strerror(-rc) << ")";
158+ qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";
167 return inputDevice;
159 return inputDevice;
168 }
160 }
169
161
170 inputDevice->setName(QString::fromLatin1(libevdev_get_name(dev)));
162 inputDevice->setName(QString::fromLatin1(libevdev_get_name(dev)));
171− inputDevice->setDevicePath(path);
172 for (int i = 0; i < EV_MAX; i++) {
163 for (int i = 0; i < EV_MAX; i++) {
173 if (i == EV_KEY || i == EV_SW || i == EV_REL
164 if (i == EV_KEY || i == EV_SW || i == EV_REL
174 || i == EV_REL || i == EV_ABS) {
165 || i == EV_REL || i == EV_ABS) {
tests/qmltests/Stages/tst_PhoneStage.qml+1
@@ -295,6 +295,7 @@ Item {
295 tryCompare(ApplicationManager, "count", oldCount - 1)
295 tryCompare(ApplicationManager, "count", oldCount - 1)
296 }
296 }
297 phoneStage.shellOrientationAngle = 0;
297 phoneStage.shellOrientationAngle = 0;
298+ phoneStage.select(ApplicationManager.get(0).appId);
298 }
299 }
299
300
300 function test_focusNewTopMostAppAfterFocusedOneClosesItself() {
301 function test_focusNewTopMostAppAfterFocusedOneClosesItself() {
tests/qmltests/tst_ShellWithPin.qml+5−4
@@ -498,12 +498,13 @@ Item {
498
498
499 function test_suspend() {
499 function test_suspend() {
500 var greeter = findChild(shell, "greeter");
500 var greeter = findChild(shell, "greeter");
501+ var applicationsDisplayLoader = findChild(shell, "applicationsDisplayLoader")
501
502
502 // Put it to sleep
503 // Put it to sleep
503 Powerd.status = Powerd.Off;
504 Powerd.status = Powerd.Off;
504
505
505− // If locked, ApplicationManager.suspended should be true
506+ // If locked, applicationsDisplayLoader.item.suspended should be true
506− tryCompare(ApplicationManager, "suspended", true);
507+ tryCompare(applicationsDisplayLoader.item, "suspended", true);
507
508
508 // And wake up
509 // And wake up
509 Powerd.status = Powerd.On;
510 Powerd.status = Powerd.On;
@@ -513,12 +514,12 @@ Item {
513 swipeAwayGreeter(true);
514 swipeAwayGreeter(true);
514
515
515 // We have a lockscreen, make sure we're still suspended
516 // We have a lockscreen, make sure we're still suspended
516− tryCompare(ApplicationManager, "suspended", true);
517+ tryCompare(applicationsDisplayLoader.item, "suspended", true);
517
518
518 enterPin("1234")
519 enterPin("1234")
519
520
520 // Now that the lockscreen has gone too, make sure we're waking up
521 // Now that the lockscreen has gone too, make sure we're waking up
521− tryCompare(ApplicationManager, "suspended", false);
522+ tryCompare(applicationsDisplayLoader.item, "suspended", false);
522
523
523 }
524 }
524
525