Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -57,34 +57,28 @@ protected void onCreate(android.os.Bundle savedInstanceState) {
return;
}

// Set up this activity as a portrait only window.
int orientation = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
if (android.os.Build.VERSION.SDK_INT >= 9) {
orientation = 7; // android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
}


if (android.os.Build.VERSION.SDK_INT <= 34) {
// Only lock orientation on devices that don’t support multi-window / resizable
if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.N) {
int orientation = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
if (android.os.Build.VERSION.SDK_INT >= 9) {
orientation = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
}
setRequestedOrientation(orientation);
}


// Display this activity full screen if requested to do so via the intent's extras.
// Display this activity full screen if requested
boolean isFullScreen = getIntent().getBooleanExtra(EXTRA_FULL_SCREEN, false);
if (isFullScreen) {
getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN);
getWindow().clearFlags(android.view.WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
}
else {
} else {
getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
getWindow().clearFlags(android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN);
}

// Initialize this flag to false.
// We must wait for this activity to be shown onscreen before displaying the Nook store dialog.
// Initialize this flag to false
fHasShownStore = false;
}

/** This method is called when this activity can be interacted with. */
@Override
protected void onResume() {
Expand Down
2 changes: 1 addition & 1 deletion subrepos/composer
Submodule composer updated 1 files
+2 −2 composer.lua
1 change: 1 addition & 0 deletions tools/buildsys-ios/libtemplate/Defaults.lua
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ function M:updateFlags( minVersion )
'-std=c++11',
'-stdlib=libc++',
'-Xlinker -rpath -Xlinker /usr/lib/swift -Xlinker -rpath -Xlinker @executable_path/Frameworks',
'-Xlinker -undefined -Xlinker dynamic_lookup',
}
end

Expand Down
Loading