git.iko.soy/unity8
on xenial help sign in
merged with trunk
f131a47Nick Dedekind
Bottombar/Bottombar.qml+48−82
compare with xenial
unifiedsplit
@@ -18,38 +18,42 @@ import QtQuick 2.0
18import "../Components"
18import "../Components"
19import "../Components/Math.js" as MathLocal
19import "../Components/Math.js" as MathLocal
20import Unity 0.1
20import Unity 0.1
21+import Ubuntu.Gestures 0.1
21
22
22Item {
23Item {
23 id: bottombar
24 id: bottombar
24− width: shell.width
25+
25− height: shell.height
26+ // Whether there's an application on foreground (as opposed to have shell's Dash on foreground)
27+ property bool applicationIsOnForeground
26
28
27 property variant theHud
29 property variant theHud
28 property bool enabled: false
30 property bool enabled: false
29 readonly property real bottomEdgeButtonCenterDistance: units.gu(34)
31 readonly property real bottomEdgeButtonCenterDistance: units.gu(34)
30− readonly property real bottomEdgeShowButtonDistance: units.gu(2)
31−
32− property bool __applicationInFocus: false
33
32
34− state: "hidden"
33+ state: dragArea.status === DirectionalDragArea.Recognized ? "shown" : "hidden"
35
34
36 HudButton {
35 HudButton {
37 id: hudButton
36 id: hudButton
38
37
39− x: MathLocal.clamp(hudButtonRevealer.pressedX - width / 2, 0, bottombar.width - width)
38+ x: MathLocal.clamp(dragArea.touchStartX - (width / 2), 0, bottombar.width - width)
40− y: bottombar.height - bottomEdgeButtonCenterDistance - height / 2 - bottomMargin
39+ y: bottombar.height - bottomEdgeButtonCenterDistance - (height / 2) - bottomMargin
41− Behavior on bottomMargin {
40+
42− NumberAnimation{duration: hudButton.opacity < 0.01 ? 200 : 70; easing.type: Easing.OutQuart}
41+ mouseOver: {
43− }
42+ if (dragArea.status === DirectionalDragArea.Recognized) {
44− mouse: {
43+ var touchLocal = mapFromItem(dragArea, dragArea.touchX, dragArea.touchY)
45− if (hudButtonRevealer.draggingArea.pressed) {
44+ return touchLocal.x > 0 && touchLocal.x < width
46− var mapped = mapFromItem(hudButtonRevealer.draggingArea, hudButtonRevealer.draggingArea.mouseX, hudButtonRevealer.draggingArea.mouseY)
45+ && touchLocal.y > 0 && touchLocal.y < height
47− return Qt.point(mapped.x, mapped.y)
48 } else {
46 } else {
49− return mouse
47+ return false
50 }
48 }
51 }
49 }
52
50
51+ onClicked: theHud.show()
52+
53+ Behavior on bottomMargin {
54+ NumberAnimation{duration: hudButton.opacity < 0.01 ? 200 : 70; easing.type: Easing.OutQuart}
55+ }
56+
53 Behavior on opacity {
57 Behavior on opacity {
54 NumberAnimation{ duration: 200; easing.type: Easing.OutCubic}
58 NumberAnimation{ duration: 200; easing.type: Easing.OutCubic}
55 }
59 }
@@ -60,74 +64,36 @@ Item {
60 onShownChanged: bottomBarVisibilityCommunicatorShell.forceHidden = theHud.shown
64 onShownChanged: bottomBarVisibilityCommunicatorShell.forceHidden = theHud.shown
61 }
65 }
62
66
63− function updateApplicationInFocus() {
67+ DirectionalDragArea {
64− if (shell.applicationManager.mainStageFocusedApplication || shell.applicationManager.sideStageFocusedApplication) {
68+ id: dragArea
65− __applicationInFocus = true
66− } else {
67− __applicationInFocus = false
68− }
69− }
70−
71− Connections {
72− target: shell.applicationManager
73− ignoreUnknownSignals: true
74− onMainStageFocusedApplicationChanged: updateApplicationInFocus()
75− onSideStageFocusedApplicationChanged: updateApplicationInFocus()
76− }
77−
78− Showable {
79− id: hudButtonShowable
80−
81− opacity: 1.0
82 width: parent.width
69 width: parent.width
83− height: bottomEdgeShowButtonDistance
70+ height: distanceThreshold
84− shown: false
85− showAnimation: StandardAnimation { property: "y"; duration: 350; to: hudButtonRevealer.openedValue; easing.type: Easing.OutCubic }
86− hideAnimation: StandardAnimation { property: "y"; duration: 350; to: hudButtonRevealer.closedValue; easing.type: Easing.OutCubic }
87− onYChanged: {
88− if (y == hudButtonRevealer.openedValue)
89− bottombar.state = "shown"
90− }
91−
92− // eater
93− MouseArea {
94− anchors.fill: parent
71+ anchors.bottom: parent.bottom
95− }
72+
96− }
97−
98− Revealer {
99− id: hudButtonRevealer
100−
101− property double pressedX
102−
103− enabled: !theHud.shown && bottombar.enabled && __applicationInFocus
73+ enabled: !theHud.shown && bottombar.enabled && applicationIsOnForeground
104− direction: Qt.RightToLeft
74+ direction: Direction.Upwards
105− openedValue: bottombar.height - height
75+
106− closedValue: bottombar.height
76+ // values to be tweaked and later removed from here and set in stone as defaults
107− target: hudButtonShowable
77+ // once we are confident it's all good.
108− width: hudButtonShowable.width
78+ maxDeviation: units.gu(1)
109− height: hudButtonShowable.height
79+ wideningAngle: 30
110− anchors.bottom: bottombar.bottom
80+ distanceThreshold: units.gu(3)
111− onOpenPressed: {
81+ minSpeed: units.gu(5)
112− pressedX = mouseX
82+
113− }
83+ property int previousStatus: -1
114−
84+ property real touchStartX: -1
115− onOpenReleased: {
85+
86+ onStatusChanged: {
87+ if (status === DirectionalDragArea.WaitingForTouch) {
88+ if (previousStatus == DirectionalDragArea.Recognized) {
116− if (hudButton.opacity != 0 && hudButton.mouseOver) {
89+ if (hudButton.mouseOver) {
117− hudButtonShowable.hide()
90+ hudButton.clicked()
118− theHud.show()
91+ }
119− } else {
92+ }
120− hudButtonShowable.hide()
93+ } else if (status === DirectionalDragArea.Undecided) {
121− }
94+ touchStartX = touchX
122− }
123− }
124−
125− Connections {
126− target: hudButtonShowable.hideAnimation
127− onRunningChanged: {
128− if (hudButtonShowable.hideAnimation.running) {
129− bottombar.state = "hidden"
130 }
95 }
96+ previousStatus = status
131 }
97 }
132 }
98 }
133
99
Bottombar/HudButton.qml+3−2
@@ -20,10 +20,11 @@ import Ubuntu.Components 0.1
20Item {
20Item {
21 id: item
21 id: item
22
22
23+ property bool mouseOver
24+
23 property int bottomMargin: units.gu(2)
25 property int bottomMargin: units.gu(2)
24− property bool mouseOver: contains(mouse)
25
26
26− property point mouse: Qt.point(-1,-1)
27+ signal clicked()
27
28
28 readonly property real scaleOnMouseOver: 1.2
29 readonly property real scaleOnMouseOver: 1.2
29
30
Bottombar/graphics/hud_invoke_button_active@20.png

Binary file not shown.

Components/graphics/icon_star_off@20.png

Binary file not shown.

Components/graphics/icon_star_on@20.png

Binary file not shown.

Components/graphics/non-selected@18.png

Binary file not shown.

Dash/Apps/graphics/close_btn@9.png

Binary file not shown.

Dash/graphics/icon_clear@20.png

Binary file not shown.

Dash/graphics/icon_listview_clear@20.png

Binary file not shown.

Dash/graphics/icon_search_active@20.png

Binary file not shown.

Dash/graphics/icon_search_inactive@20.png

Binary file not shown.

Dash/graphics/phone/home.png

Binary file not shown.

Dash/graphics/phone/music.png

Binary file not shown.

Dash/graphics/phone/screenshots/angrybirds@12.png

Binary file not shown.

Dash/graphics/phone/screenshots/browser@12.png

Binary file not shown.

Dash/graphics/phone/screenshots/camera@12.png

Binary file not shown.

Dash/graphics/phone/screenshots/facebook@12.png

Binary file not shown.

Dash/graphics/phone/screenshots/gallery@12.png

Binary file not shown.

Dash/graphics/phone/screenshots/map@12.png

Binary file not shown.

Dash/graphics/phone/screenshots/music@12.png

Binary file not shown.

Dash/graphics/phone/screenshots/phone@12.png

Binary file not shown.

Dash/graphics/phone/screenshots/settings@12.png

Binary file not shown.

Dash/graphics/phone/screenshots/twitter@12.png

Binary file not shown.

Dash/graphics/phone/videos.png

Binary file not shown.

Dash/graphics/play_button@18.png

Binary file not shown.

Dash/graphics/play_button_active@18.png

Binary file not shown.

Dash/graphics/play_button_active_big@20.png

Binary file not shown.

Dash/graphics/play_button_big@20.png

Binary file not shown.

Dash/graphics/tablet/apps.png

Binary file not shown.

Dash/graphics/tablet/home.png

Binary file not shown.

Dash/graphics/tablet/icon_close_preview@20.png

Binary file not shown.

Dash/graphics/tablet/music.png

Binary file not shown.

Dash/graphics/tablet/people.png

Binary file not shown.

Dash/graphics/tablet/videos.png

Binary file not shown.

Greeter/graphics/dot_empty.png

Binary file not shown.

Greeter/graphics/dot_filled.png

Binary file not shown.

Greeter/graphics/dot_pointer.png

Binary file not shown.

Greeter/graphics/infographic_circle.png

Binary file not shown.

Hud/graphics/hud_bg@20.png

Binary file not shown.

Hud/graphics/hud_handlearrow@20.png

Binary file not shown.

Hud/graphics/hud_handlebar@20.png

Binary file not shown.

Hud/graphics/icon_clear@20.png

Binary file not shown.

Hud/graphics/icon_search@20.png

Binary file not shown.

Launcher/graphics/highlight@18.png

Binary file not shown.

Launcher/graphics/non-selected@18.png

Binary file not shown.

Launcher/graphics/selected@18.png

Binary file not shown.

Launcher/graphics/triangle@18.png

Binary file not shown.

Panel/graphics/Battery@18.png

Binary file not shown.

Panel/graphics/Bluetooth@18.png

Binary file not shown.

Panel/graphics/Clock@18.png

Binary file not shown.

Panel/graphics/Location@18.png

Binary file not shown.

Panel/graphics/Messages@18.png

Binary file not shown.

Panel/graphics/Network@18.png

Binary file not shown.

Panel/graphics/Sound@18.png

Binary file not shown.

Panel/graphics/Sync@18.png

Binary file not shown.

Panel/graphics/System@18.png

Binary file not shown.

Panel/graphics/Time@18.png

Binary file not shown.

Panel/graphics/VerticalDivider@18.png

Binary file not shown.

Panel/graphics/rectangular_dropshadow@30.png

Binary file not shown.

Panel/graphics/search@12.png

Binary file not shown.

Shell.qml+3
@@ -188,6 +188,7 @@ FocusScope {
188
188
189 property bool fullyShown: shown && stages[stagesRevealer.boundProperty] == stagesRevealer.openedValue
189 property bool fullyShown: shown && stages[stagesRevealer.boundProperty] == stagesRevealer.openedValue
190 && parent.x == 0
190 && parent.x == 0
191+
191 property bool fullyHidden: !shown && stages[stagesRevealer.boundProperty] == stagesRevealer.closedValue
192 property bool fullyHidden: !shown && stages[stagesRevealer.boundProperty] == stagesRevealer.closedValue
192 available: !greeter.shown
193 available: !greeter.shown
193 hides: [launcher, panel.indicators]
194 hides: [launcher, panel.indicators]
@@ -515,6 +516,8 @@ FocusScope {
515 theHud: hud
516 theHud: hud
516 anchors.fill: parent
517 anchors.fill: parent
517 enabled: !panel.indicators.shown
518 enabled: !panel.indicators.shown
519+ applicationIsOnForeground: applicationManager.mainStageFocusedApplication
520+ || applicationManager.sideStageFocusedApplication
518 }
521 }
519
522
520 InputFilterArea {
523 InputFilterArea {
build+17−8
@@ -1,10 +1,9 @@
1#!/bin/sh
1#!/bin/sh
2
2
3−PACKAGE=unity8
4−UNITY_BUILD_DIR=$PWD/../unity_build/build
5SETUP=false
3SETUP=false
6CLEAN=false
4CLEAN=false
7NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
5NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
6+CODE_DIR=$( dirname `readlink -f $0` )
8
7
9usage() {
8usage() {
10 echo "usage: build [OPTIONS] [BUILD_TYPE]\n" >&2
9 echo "usage: build [OPTIONS] [BUILD_TYPE]\n" >&2
@@ -37,13 +36,25 @@ BUILD_TYPE="debug"
37[ $# -eq 1 ] && BUILD_TYPE="$1"
36[ $# -eq 1 ] && BUILD_TYPE="$1"
38
37
39install_dependencies() {
38install_dependencies() {
40− . /etc/lsb-release
41 [ -f /etc/apt/sources.list.d/phablet-team-desktop-deps-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:phablet-team/desktop-deps || exit 1
39 [ -f /etc/apt/sources.list.d/phablet-team-desktop-deps-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:phablet-team/desktop-deps || exit 1
42 [ -f /etc/apt/sources.list.d/canonical-qt5-edgers-qt5-proper-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:canonical-qt5-edgers/qt5-proper || exit 2;
40 [ -f /etc/apt/sources.list.d/canonical-qt5-edgers-qt5-proper-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:canonical-qt5-edgers/qt5-proper || exit 2;
43 [ -f /etc/apt/sources.list.d/ubuntu-sdk-team-ppa-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:ubuntu-sdk-team/ppa || exit 3
41 [ -f /etc/apt/sources.list.d/ubuntu-sdk-team-ppa-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:ubuntu-sdk-team/ppa || exit 3
44 sudo apt-get update || exit 4
42 sudo apt-get update || exit 4
45 echo "Installing Unity 8 dependencies.."
43 echo "Installing Unity 8 dependencies.."
46− sudo apt-get install qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtbase5-private-dev qtdeclarative5-dev qtdeclarative5-dev-tools qtdeclarative5-test-plugin libdee-qt5-dev libnm-glib-dev libnm-util-dev libqmenumodel-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets ubuntu-mobile-icons || exit 5
44+ sudo apt-get install devscripts \
45+ equivs \
46+ libnm-glib-dev \
47+ libnm-util-dev \
48+ libqmenumodel-dev \
49+ qtdeclarative5-ubuntu-ui-toolkit-plugin \
50+ qtdeclarative5-dee-plugin \
51+ ubuntu-mobile-icons \
52+ unity-notifications-impl-1 \
53+ || exit 5
54+}
55+
56+mk_build_deps() {
57+ [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control
47}
58}
48
59
49if [ -f "/usr/bin/ninja" ] ; then
60if [ -f "/usr/bin/ninja" ] ; then
@@ -56,13 +67,11 @@ fi
56
67
57if $SETUP; then
68if $SETUP; then
58 install_dependencies
69 install_dependencies
59− ./build_unity --setup || exit 1$?
60− ./build_unity || exit 1$?
61else
70else
62 if $CLEAN; then rm -rf builddir; fi
71 if $CLEAN; then rm -rf builddir; fi
63 mkdir -p builddir
72 mkdir -p builddir
64 cd builddir
73 cd builddir
74+ mk_build_deps
65− PKG_CONFIG_PATH=$UNITY_BUILD_DIR/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. ${GENERATOR} || exit 6
75+ cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6
66 ${BUILD_COMMAND} || exit 7
76 ${BUILD_COMMAND} || exit 7
67fi
77fi
68−
build_unitydeleted−158
@@ -1,158 +0,0 @@
1−#!/bin/bash
2−
3−TARGET_DIR=$PWD/../unity_build
4−BUILD_DIR=$TARGET_DIR/build
5−SETUP=false
6−UPDATE=false
7−CLEAN=false
8−NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
9−
10−# verified working revisions
11−LIBUNITY_REV=228
12−UNITY_REV=3343
13−HUD_REV=252
14−
15−usage() {
16− echo "usage: build_unity [OPTIONS]\n"
17− echo "Script to build Unity on Ubuntu 12.10.\n"
18− echo "OPTIONS:"
19− echo " -s, --setup Setup the build environment and branch Unity"
20− echo " -u, --update Update Unity's source code"
21− echo " -c, --clean Clean build trees before building"
22− exit 1
23−}
24−
25−set -- `getopt -n$0 -u -a --longoptions="setup,update,clean,help" "such" "$@"`
26−
27−# FIXME: giving incorrect arguments does not call usage and exit
28−while [ $# -gt 0 ]
29−do
30− case "$1" in
31− -s|--setup) SETUP=true;;
32− -u|--update) UPDATE=true;;
33− -c|--clean) CLEAN=true;;
34− -h|--help) usage;;
35− --) shift;break;;
36− esac
37− shift
38−done
39−
40−install_utils() {
41− echo "Installing build utilities.."
42− sudo apt-get install devscripts equivs || exit 4
43−}
44−
45−mk_build_deps() {
46− echo "Installing build dependencies.."
47− cd $TARGET_DIR
48− sudo mk-build-deps -B -i $TARGET_DIR/libunity/debian/control || exit 5
49− sudo mk-build-deps -B -i $TARGET_DIR/unity/debian/control || exit 6
50− sudo mk-build-deps -B -i $TARGET_DIR/hud/debian/control || exit 7
51−}
52−
53−branch_libunity() {
54− echo "Branching libunity.."
55− bzr branch lp:libunity $TARGET_DIR/libunity || exit 8
56−}
57−
58−branch_unity() {
59− echo "Branching Unity.."
60− bzr branch lp:unity $TARGET_DIR/unity || exit 9
61−}
62−
63−branch_hud() {
64− echo "Branching hud.."
65− bzr branch lp:hud $TARGET_DIR/hud || exit 10
66−}
67−
68−update_unity() {
69− echo "Updating Unity.."
70− bzr pull -d $TARGET_DIR/unity || exit 11
71−}
72−
73−update_libunity() {
74− echo "Updating libunity.."
75− bzr pull -d $TARGET_DIR/libunity || exit 12
76−}
77−
78−update_hud() {
79− echo "Updating hud"
80− bzr pull -d $TARGET_DIR/hud || exit 13
81−}
82−
83−compile_libunity() {
84− echo "Configuring libunity.."
85−
86− if $CLEAN; then bzr clean-tree -d $TARGET_DIR/libunity --quiet --unknown --ignored --force; fi
87−
88− cd $TARGET_DIR/libunity
89− bzr revert --quiet -r $LIBUNITY_REV || exit 14
90−
91− mkdir $TARGET_DIR/libunity/build
92− cd $TARGET_DIR/libunity/build
93−
94− ../autogen.sh --prefix $BUILD_DIR --disable-debug --with-pygi-overrides-dir=$BUILD_DIR/gi-overrides || exit 15
95−
96− echo "Building libunity and installing in " $BUILD_DIR
97− make -j$NUM_JOBS install || exit 16
98−
99−}
100−
101−compile_unity_core() {
102− echo "Configuring Unity.."
103−
104− if $CLEAN; then bzr clean-tree -d $TARGET_DIR/unity --quiet --unknown --ignored --force; fi
105−
106− cd $TARGET_DIR/unity
107− bzr revert --quiet -r $UNITY_REV || exit 17
108−
109− mkdir $TARGET_DIR/unity/build
110− cd $TARGET_DIR/unity/build
111−
112− PKG_CONFIG_PATH=$BUILD_DIR/lib/pkgconfig:$PKG_CONFIG_PATH cmake $TARGET_DIR/unity -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$BUILD_DIR -DCOMPIZ_PLUGIN_INSTALL_TYPE=local -DGSETTINGS_LOCALINSTALL=ON || exit 18
113−
114− echo "Building UnityCore and installing in " $BUILD_DIR
115− cd UnityCore
116− make -j$NUM_JOBS install || exit 19
117−
118−}
119−
120−compile_hud() {
121− echo "Configuring hud.."
122−
123− if $CLEAN; then bzr clean-tree -d $TARGET_DIR/hud --quiet --unknown --ignored --force; fi
124−
125− cd $TARGET_DIR/hud
126− bzr revert -r $HUD_REV || exit 20
127−
128− mkdir $TARGET_DIR/hud/build
129− cd $TARGET_DIR/hud/build
130−
131− cmake $TARGET_DIR/hud/ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$BUILD_DIR -DCMAKE_INSTALL_LIBDIR=lib -DLOCAL_INSTALL=ON -DENABLE_TESTS=OFF || exit 21
132−
133− echo "Building hud and installing in " $BUILD_DIR
134− make install || exit 22
135−
136−}
137−
138−if $SETUP; then
139− echo "Setting up environment for building Unity.."
140− install_utils
141− mkdir -p $TARGET_DIR
142− branch_libunity
143− branch_unity
144− branch_hud
145− mk_build_deps
146−elif $UPDATE; then
147− update_libunity
148− update_unity
149− update_hud
150− mk_build_deps
151−else
152− if $CLEAN; then rm -Rf $BUILD_DIR; fi
153− mkdir -p $BUILD_DIR
154− compile_libunity
155− compile_unity_core
156− compile_hud
157−fi
158−
debian/rules+1
@@ -4,6 +4,7 @@
4# Uncomment this to turn on verbose mode.
4# Uncomment this to turn on verbose mode.
5#export DH_VERBOSE=1
5#export DH_VERBOSE=1
6export DPKG_GENSYMBOLS_CHECK_LEVEL=4
6export DPKG_GENSYMBOLS_CHECK_LEVEL=4
7+export NO_PNG_PKG_MANGLE=1
7
8
8%:
9%:
9 dh $@ --parallel
10 dh $@ --parallel
graphics/12_10_background_wide@12.png

Binary file not shown.

graphics/applicationIcons/angrybirds@18.png

Binary file not shown.

graphics/applicationIcons/camera@18.png

Binary file not shown.

graphics/applicationIcons/dash@18.png

Binary file not shown.

graphics/applicationIcons/evernote@18.png

Binary file not shown.

graphics/applicationIcons/gallery@18.png

Binary file not shown.

graphics/applicationIcons/map@18.png

Binary file not shown.

graphics/applicationIcons/music@18.png

Binary file not shown.

graphics/applicationIcons/phone-app@18.png

Binary file not shown.

graphics/applicationIcons/pinterest@18.png

Binary file not shown.

graphics/applicationIcons/ski_safari@18.png

Binary file not shown.

graphics/applicationIcons/skype@18.png

Binary file not shown.

graphics/applicationIcons/twitter@18.png

Binary file not shown.

graphics/applicationIcons/youtube@18.png

Binary file not shown.

graphics/avatars/amanda@12.png

Binary file not shown.

graphics/avatars/anna_olsson@12.png

Binary file not shown.

graphics/avatars/funky@12.png

Binary file not shown.

graphics/clock@18.png

Binary file not shown.

run−1
@@ -1,7 +1,6 @@
1#!/bin/sh
1#!/bin/sh
2
2
3QML_PHONE_SHELL_PATH=./builddir/unity8
3QML_PHONE_SHELL_PATH=./builddir/unity8
4−export LD_LIBRARY_PATH=$PWD/../unity_build/build/lib:$PWD/../unity_build/build/lib/libunity
5GDB=false
4GDB=false
6FAKE=false
5FAKE=false
7PINLOCK=false
6PINLOCK=false
tests/autopilot/unity8/tests/helpers.py+2−1
@@ -98,7 +98,8 @@ class TestShellHelpers(object):
98 # go to the void for the first time because there's no real way to know what the display has
98 # go to the void for the first time because there's no real way to know what the display has
99 # painted already. Give it another (max retries) chance.
99 # painted already. Give it another (max retries) chance.
100 try:
100 try:
101− self.assertThat(lambda: getattr(bottombar, "__applicationInFocus"), Eventually(Equals(True)))
101+ self.assertThat(lambda: getattr(bottombar, "applicationIsOnForeground"),
102+ Eventually(Equals(True)))
102 except:
103 except:
103 if retries > 0:
104 if retries > 0:
104 logger.warning("Failed to launch app. Retrying...")
105 logger.warning("Failed to launch app. Retrying...")