Skip to content

[pull] master from googlevr:master #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Mar 11, 2026
Merged

[pull] master from googlevr:master #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hellocardboard-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {
minSdkVersion = 26
targetSdkVersion = 35
versionCode 1
versionName "1.32.0"
versionName "1.33.0"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a'
Expand Down
4 changes: 4 additions & 0 deletions hellocardboard-android/src/main/res/layout/activity_vr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
android:id="@+id/ui_back_button_holder"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="18dp"
android:layout_marginTop="18dp"
android:layout_width="84dp"
android:layout_height="84dp">
<ImageButton
Expand All @@ -40,6 +42,8 @@
android:id="@+id/ui_settings_button_holder"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="18dp"
android:layout_marginTop="18dp"
android:layout_width="42dp"
android:layout_height="42dp">
<ImageButton
Expand Down
4 changes: 2 additions & 2 deletions hellocardboard-ios/HelloCardboard-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.32.0</string>
<string>1.33.0</string>
<key>CFBundleVersion</key>
<string>1.32.0</string>
<string>1.33.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSCameraUsageDescription</key>
Expand Down
23 changes: 9 additions & 14 deletions sdk/qrcode/android/java/com/google/cardboard/sdk/QrCodeCaptureActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
import androidx.core.app.ActivityCompat;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.core.view.WindowInsetsControllerCompat;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.android.gms.vision.MultiProcessor;
Expand Down Expand Up @@ -77,20 +79,13 @@ public void onCreate(Bundle icicle) {
super.onCreate(icicle);
setContentView(R.layout.qr_code_capture);

// Adds margins to the container to account for edge to edge:
// https://developer.android.com/develop/ui/views/layout/edge-to-edge
View container = findViewById(R.id.container);
ViewCompat.setOnApplyWindowInsetsListener(
container,
(v, windowInsets) -> {
Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
mlp.leftMargin = insets.left;
mlp.bottomMargin = insets.bottom;
mlp.rightMargin = insets.right;
v.setLayoutParams(mlp);
return WindowInsetsCompat.CONSUMED;
});
// Hide system bars
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
WindowInsetsControllerCompat windowInsetsController =
new WindowInsetsControllerCompat(getWindow(), getWindow().getDecorView());
windowInsetsController.hide(WindowInsetsCompat.Type.systemBars());
windowInsetsController.setSystemBarsBehavior(
WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);

cameraSourcePreview = findViewById(R.id.preview);
}
Expand Down