Merge lp:~andreas-pokorny/ubuntu-touch-session/gu-evaluation-in-usc-wrapper into lp:ubuntu-touch-session

[Andreas Pokorny]

Temporary for demoing purposes mirserver evaluates GRID_UNIT_PX to scale cursors. This change sets GRID_UNIT_PX before starting u-s-c

Unmerged revisions

256. By Andreas Pokorny on 2015-02-07

get grid unit set for usc

255. By Andreas Pokorny on 2015-02-04

enable hardware cursors on the phone

With this change a cursor will be visible on start. With the lp:~mir-team/unity-system-compositor/toggle-cursor it will only be visible as soon as a mouse move is detected

=== modified file 'usc-wrapper'
--- usc-wrapper	2014-09-08 21:02:31 +0000
+++ usc-wrapper	2015-02-07 07:12:38 +0000
@@ -5,4 +5,14 @@
 . /etc/environment
 export ANDROID_ROOT
 
-exec unity-system-compositor --disable-overlays=false --spinner=/usr/bin/unity-system-compositor-spinner $@
+# workaround: get GRID_UNIT_PX setting for usc to allow scaling cursors
+GRID_UNIT_PX=18
+# override defaults by sourcing /etc/ubuntu-touch-session.d/$device.conf
+device=$(getprop ro.product.device)
+if [ -e /etc/ubuntu-touch-session.d/$device.conf ]; then
+    . /etc/ubuntu-touch-session.d/$device.conf
+fi
+
+export GRID_UNIT_PX
+
+exec unity-system-compositor --enable-hardware-cursor=true --disable-overlays=false --spinner=/usr/bin/unity-system-compositor-spinner $@