Merge lp:~abreu-alexandre/ubuntu-html5-theme/control-automatic-orientation-of-app into lp:ubuntu-html5-theme

[Alexandre Abreu]

Allow control of automatic orientation of the app

Allow control of automatic orientation of the app.

To test it in the device:

bzr branch lp:~abreu-alexandre/ubuntu-html5-theme/control-automatic-orientation-of-app
cd control-automatic-orientation-of-app
cmake .
make
cd src/ubuntu-html5-app-launcher
QML2_IMPORT_PATH=`pwd`/../src ./ubuntu-html5-app-launcher --www=../../examples/html5-theme/apps/rss-reader/ --desktop_file_hint=/usr/share/applications/webbrowser-app.desktop

-> you should be able when rotating the device to see the app screen rotate too

QML2_IMPORT_PATH=`pwd`/../src ./ubuntu-html5-app-launcher --disableAutomaticOrientation --www=../../examples/html5-theme/apps/rss-reader/ --desktop_file_hint=/usr/share/applications/webbrowser-app.desktop

-> you should NOT be able when rotating the device to see the app screen rotate too

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:147
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3477
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3480
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3480/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/113/rebuild

review: Approve (continuous-integration)

[David Barth (dbarth)]

Feels like a race condition solved by a different initialization path.

I'm not sure the command line option really makes sense but for tests though: can you remove it? less code is better.

[Alexandre Abreu (abreu-alexandre)]

> Feels like a race condition solved by a different initialization path.
>
> I'm not sure the command line option really makes sense but for tests though:
> can you remove it? less code is better.

Not sure I understand the comment, ... this is a new command line arg & option
... that's it,

[David Barth (dbarth)]

Le 25/02/2014 14:35, Alexandre Abreu a écrit :
>> Feels like a race condition solved by a different initialization path.
>>
>> I'm not sure the command line option really makes sense but for tests though:
>> can you remove it? less code is better.
> Not sure I understand the comment, ... this is a new command line arg & option
> ... that's it,
right, but less is better: more options means more code and backward
compatibility overhead in the future.

David

[Alexandre Abreu (abreu-alexandre)]

> Le 25/02/2014 14:35, Alexandre Abreu a écrit :
> >> Feels like a race condition solved by a different initialization path.
> >>
> >> I'm not sure the command line option really makes sense but for tests
> though:
> >> can you remove it? less code is better.
> > Not sure I understand the comment, ... this is a new command line arg &
> option
> > ... that's it,

> right, but less is better: more options means more code and backward
> compatibility overhead in the future.

atm there is no way for dev, to specify that their apps runs & supports
automatic rotation or not ... which is something lacking. This is not
just for the sake of adding a setting, but something provided by
other platforms that we dont support & I saw a need for while working on
html5 apps

[Alexandre Abreu (abreu-alexandre)]

I did set up as WIP since I want to add something else

Unmerged revisions

147. By Alexandre Abreu on 2014-02-25

Allow control of automatic orientation of the app

=== modified file 'src/plugin/Ubuntu/WebApps/WebAppContainer.qml'
--- src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2014-02-18 15:44:48 +0000
+++ src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2014-02-25 01:36:43 +0000
@@ -31,7 +31,12 @@
     id: root
     objectName: "root"
 
-    automaticOrientation: true
+    /*!
+      \preliminary
+      The property enables or disables the automatic rotation of the application screen based on the
+      device's orientation.
+      */
+    property bool allowAutomaticOrientation: true
 
     /*!
       \preliminary
@@ -42,6 +47,8 @@
       */
     property alias htmlIndexDirectory: cordovaWebviewProvider.htmlIndexDirectory
 
+    automaticOrientation: allowAutomaticOrientation
+
     Page {
         id: mainPage
         anchors.fill: parent

=== modified file 'src/ubuntu-html5-app-launcher/main.cpp'
--- src/ubuntu-html5-app-launcher/main.cpp	2014-02-19 21:23:07 +0000
+++ src/ubuntu-html5-app-launcher/main.cpp	2014-02-25 01:36:43 +0000
@@ -87,6 +87,8 @@
     out << "  -h, --help                     display this help message and exit" << endl;
     out << "  --www=PATH                     relative or absolute path to the 'index.html' root file" << endl;
     out << "  --maximized                    maximize the app window at startup time" << endl;
+    out << "  --disableAutomaticOrientation  disables the automatic orientation"
+        << " of the application screen based on the device's orientation" << endl;
     out << "  --inspector                    run a remote inspector on port "
         << REMOTE_INSPECTOR_PORT << endl;
 }
@@ -104,12 +106,14 @@
 
     const QString WWW_LOCATION_ARG_HEADER = "--www=";
     const QString MAXIMIZED_ARG_HEADER = "--maximized";
+    const QString DISABLE_AUTO_ORIENTATION_ARG_HEADER = "--disableAutomaticOrientation";
     const QString ARG_HEADER = "--";
     const QString VALUE_HEADER = "=";
     const QString INSPECTOR = "--inspector";
 
     QString wwwfolderArg;
     bool maximized = false;
+    bool disableAutomaticOrientation = false;
 
     QStringList arguments = app.arguments();
     arguments.pop_front();
@@ -126,6 +130,11 @@
             maximized = true;
         }
         else
+        if (argument.contains(DISABLE_AUTO_ORIENTATION_ARG_HEADER))
+        {
+            disableAutomaticOrientation = true;
+        }
+        else
         if (argument.contains(INSPECTOR))
         {
             QString host;
@@ -196,6 +205,12 @@
     }
     view.rootObject()->setProperty("htmlIndexDirectory", wwwFolder.canonicalFilePath());
 
+    if (disableAutomaticOrientation)
+    {
+        qDebug() << "Disabling automatic orientation";
+        view.rootObject()->setProperty("allowAutomaticOrientation", false);
+    }
+
     view.setTitle(QCoreApplication::applicationName());
     view.setResizeMode(QQuickView::SizeRootObjectToView);