Merge ~santoshbit2007/oxide:nativeOrientationFix_oxide1.17 into oxide:1.17

[Santosh]

Back Porting native Orientation fix.

1cc8c31... by Santosh on 2016-08-22

Backporting native orientation fix for M10(cooler and frieza)

[Chris Coulson (chrisccoulson)]

Thanks, it looks ok although I've left one small comment. Feel free to push this with that fixed.

review: Approve

diff --git a/qt/core/browser/oxide_qt_screen_client.cc b/qt/core/browser/oxide_qt_screen_client.cc
index 3d3e5e3..3d70709 100644
--- a/qt/core/browser/oxide_qt_screen_client.cc
+++ b/qt/core/browser/oxide_qt_screen_client.cc
@@ -70,7 +70,7 @@ void ScreenClient::UpdatePrimaryDisplay() {
         screen));
 
   primary_display_.SetRotationAsDegree(
-      screen->angleBetween(screen->nativeOrientation(),
+      screen->angleBetween(GetNativeOrientation(screen),
                            screen->orientation()));
 }
 
diff --git a/qt/core/browser/oxide_qt_screen_utils.cc b/qt/core/browser/oxide_qt_screen_utils.cc
index 4f95c9c..890f49e 100644
--- a/qt/core/browser/oxide_qt_screen_utils.cc
+++ b/qt/core/browser/oxide_qt_screen_utils.cc
@@ -26,6 +26,10 @@
 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationType.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 
+#if defined(ENABLE_HYBRIS)
+#include "shared/browser/oxide_hybris_utils.h"
+#endif
+
 #include "oxide_qt_dpi_utils.h"
 #include "oxide_qt_type_conversions.h"
 
@@ -83,10 +87,32 @@ blink::WebScreenInfo GetWebScreenInfoFromQScreen(QScreen* screen) {
 
   result.orientationAngle =
       screen->angleBetween(screen->orientation(),
-                           screen->nativeOrientation());
+                           GetNativeOrientation(screen));
 
   return result;
 }
 
+Qt::ScreenOrientation GetNativeOrientation(QScreen* screen) {
+  Qt::ScreenOrientation native_orientation = screen->nativeOrientation();
+
+#if defined(ENABLE_HYBRIS)
+  // FIXME : Remove below hack once #1612659 is fixed
+  std::string device_name;
+  if (oxide::HybrisUtils::HasDeviceProperties()) {
+    device_name = oxide::HybrisUtils::GetDeviceProperties().device;
+  }
+
+  if ((device_name == "cooler" || device_name == "frieza") &&
+      screen == QGuiApplication::primaryScreen()) {
+    // The native orientation returned by qt for M10 devices
+    // is portrait which is wrong. It should be landscape.
+    // See https://launchpad.net/bugs/1601887
+    native_orientation = Qt::LandscapeOrientation;
+  }
+#endif
+
+ return native_orientation;
+}
+
 } // namespace qt
 } // namespace oxide
diff --git a/qt/core/browser/oxide_qt_screen_utils.h b/qt/core/browser/oxide_qt_screen_utils.h
index ff9186e..4daece0 100644
--- a/qt/core/browser/oxide_qt_screen_utils.h
+++ b/qt/core/browser/oxide_qt_screen_utils.h
@@ -19,6 +19,7 @@
 #define _OXIDE_QT_CORE_BROWSER_SCREEN_UTILS_H_
 
 #include <QtGlobal>
+#include <QScreen>
 
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
 
@@ -30,6 +31,7 @@ namespace oxide {
 namespace qt {
 
 blink::WebScreenInfo GetWebScreenInfoFromQScreen(QScreen* screen);
+Qt::ScreenOrientation GetNativeOrientation(QScreen* screen);
 
 } // namespace qt
 } // namespace oxide
diff --git a/shared/BUILD.gn b/shared/BUILD.gn
index 4fa21f0..b7c2bfd 100644
--- a/shared/BUILD.gn
+++ b/shared/BUILD.gn
@@ -36,6 +36,10 @@ config("shared_include_dirs") {
   ]
 }
 
+config("hybris_defines") {
+  defines = [ "ENABLE_HYBRIS" ]
+}
+
 grit("shared_resources") {
   source = "oxide_resources.grd"
   outputs = [
@@ -587,7 +591,7 @@ component("shared") {
 
   if (enable_hybris) {
     assert(is_linux)
-    defines += [ "ENABLE_HYBRIS" ]
+    public_configs += [ ":hybris_defines" ]
 
     configs += [
       "//oxide/build/config/linux:android_properties"
diff --git a/shared/browser/oxide_hybris_utils.h b/shared/browser/oxide_hybris_utils.h
index a47f5b7..c07f93d 100644
--- a/shared/browser/oxide_hybris_utils.h
+++ b/shared/browser/oxide_hybris_utils.h
@@ -21,10 +21,11 @@
 #include <string>
 
 #include "base/macros.h"
+#include "shared/common/oxide_shared_export.h"
 
 namespace oxide {
 
-class HybrisUtils {
+class OXIDE_SHARED_EXPORT HybrisUtils {
  public:
 
   struct DeviceProperties {