Cardboard SDK v1.25.0

googlevr · May 14, 2024 · 596352d · 596352d
1 parent 672a1b6
commit 596352d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/hellocardboard-android/build.gradle b/hellocardboard-android/build.gradle
@@ -18,7 +18,7 @@ android {
         minSdkVersion 26
         targetSdkVersion 33
         versionCode 1
-        versionName "1.24.0"
+        versionName "1.25.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a'

diff --git a/hellocardboard-ios/HelloCardboard-Info.plist b/hellocardboard-ios/HelloCardboard-Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.24.0</string>
+	<string>1.25.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.24.0</string>
+	<string>1.25.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

diff --git a/hellocardboard-ios/HelloCardboardAppDelegate.m b/hellocardboard-ios/HelloCardboardAppDelegate.m
@@ -48,11 +48,12 @@ - (BOOL)application:(UIApplication *)application
   return YES;
 }
 
-// Make the navigation controller defer the check of supported orientation to its topmost view
-// controller. This allows |CardboardViewController| to lock the orientation in VR mode.
+// Make the navigation controller defer the check of supported orientation to its visible view
+// controller. This allows |CardboardViewController| to lock the orientation in VR mode and allow
+// all orientations for QRScanViewController.
 - (UIInterfaceOrientationMask)navigationControllerSupportedInterfaceOrientations:
     (UINavigationController *)navigationController {
-  return [navigationController.topViewController supportedInterfaceOrientations];
+  return [navigationController.visibleViewController supportedInterfaceOrientations];
 }
 
 @end
diff --git a/sdk/qrcode/ios/qr_scan_view_controller.mm b/sdk/qrcode/ios/qr_scan_view_controller.mm
@@ -278,6 +278,10 @@ - (UIInterfaceOrientation)viewOrientation {
   return [UIApplication sharedApplication].statusBarOrientation;
 }
 
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+  return UIInterfaceOrientationMaskAll;
+}
+
 - (AVCaptureVideoOrientation)videoOrientation {
   UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
   switch (orientation) {

diff --git a/sdk/sensors/ios/sensor_event_producer.mm b/sdk/sensors/ios/sensor_event_producer.mm
@@ -34,17 +34,17 @@
 struct DeviceSensor {};
 
 template <>
-struct cardboard::DeviceSensor<AccelerometerData> {
+struct DeviceSensor<AccelerometerData> {
   std::unique_ptr<DeviceAccelerometerSensor> value;
 };
 
 template <>
-struct cardboard::DeviceSensor<GyroscopeData> {
+struct DeviceSensor<GyroscopeData> {
   std::unique_ptr<DeviceGyroscopeSensor> value;
 };
 
 template <typename DataType>
-struct cardboard::SensorEventProducer<DataType>::EventProducer {
+struct SensorEventProducer<DataType>::EventProducer {
   EventProducer() : run_thread(false) {}
 
   // Sensor to poll for data.

diff --git a/third_party/unity_plugin_api/bluze.textproto b/third_party/unity_plugin_api/bluze.textproto
@@ -34,3 +34,11 @@ buildable_unit: {
     on_demand_frequency: EVERY_4_HOURS
   }
 }
+continuous_tests: {
+  name: "third_party.unity.pluginapi"
+  buildable_unit_name: "third_party.unity.pluginapi"
+}
+continuous_tests: {
+  name: "third_party.unity.pluginapi.opt"
+  buildable_unit_name: "third_party.unity.pluginapi.opt"
+}