commit 05270f4d28e1fa15a90e8c5d6000863bd10aaffc
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 14 18:08:53 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 14 18:08:54 2017 +0000
tree 6def2279a898195fb9f185a4a95deaa079ca90b3
parent 7311c4a899bc549dc4cc6141d3f97d17ea8eb396
parent 8a0be9060703dae8c6f0e9fc699f1bb3f7db6380

Merge "Preserve phones screen aspect ratio for VR Window Manager."

services/vr/vr_window_manager/composer/impl/vr_hwc.cpp

diff --git a/services/vr/vr_window_manager/composer/impl/vr_hwc.cpp b/services/vr/vr_window_manager/composer/impl/vr_hwc.cpp
index 6a78c98..bd801f0 100644
--- a/services/vr/vr_window_manager/composer/impl/vr_hwc.cpp
+++ b/services/vr/vr_window_manager/composer/impl/vr_hwc.cpp
@@ -301,10 +301,10 @@
 
   switch (attribute) {
     case IComposerClient::Attribute::WIDTH:
-      *outValue = 1920;
+      *outValue = 1080;
       break;
     case IComposerClient::Attribute::HEIGHT:
-      *outValue = 1080;
+      *outValue = 1920;
       break;
     case IComposerClient::Attribute::VSYNC_PERIOD:
       *outValue = 1000 * 1000 * 1000 / 30;  // 30fps

services/vr/vr_window_manager/shell_view.cpp

diff --git a/services/vr/vr_window_manager/shell_view.cpp b/services/vr/vr_window_manager/shell_view.cpp
index abe9c60..03d582c 100644
--- a/services/vr/vr_window_manager/shell_view.cpp
+++ b/services/vr/vr_window_manager/shell_view.cpp
@@ -15,7 +15,7 @@
 
 namespace {
 
-constexpr float kLayerScaleFactor = 4.0f;
+constexpr float kLayerScaleFactor = 3.0f;
 
 constexpr unsigned int kVRAppLayerCount = 2;
 
@@ -131,7 +131,7 @@
   m(3, 0) = 0.0f; m(3, 1) = 0.0f; m(3, 2) = 0.0f; m(3, 3) = 1.0f;
   // clang-format on
 
-  return m * Eigen::AngleAxisf(M_PI * 0.5f, vec3::UnitZ());
+  return m;
 }
 
 // Helper function that applies the crop transform to the texture layer and
@@ -712,10 +712,12 @@
     return;
   }
 
+  // Device is portrait, but in landscape when in VR.
+  // Rotate touch input appropriately.
   const android::status_t status = virtual_touchpad_->Touch(
       VirtualTouchpad::PRIMARY,
+      1.0f - hit_location_in_window_coord_.y() / size_.y(),
       hit_location_in_window_coord_.x() / size_.x(),
-      hit_location_in_window_coord_.y() / size_.y(),
       is_touching_ ? 1.0f : 0.0f);
   if (status != OK) {
     ALOGE("touch failed: %d", status);