Skip to content

Android Activities can resume with some or all of the UI object state… #798

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inclement merged 1 commit into from
Jun 23, 2016
Merged

Android Activities can resume with some or all of the UI object state… #798

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
13 changes: 7 additions & 6 deletions pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Log.v(TAG, "Did super onCreate");

this.showLoadingScreen();
this.mActivity = this;

String mFilesDirectory = mActivity.getFilesDir().getAbsolutePath();
Expand Down Expand Up @@ -325,6 +324,8 @@ protected void showLoadingScreen() {
// 1. if the image is valid and we don't have layout yet, assign this bitmap
// as main view.
// 2. if we have a layout, just set it in the layout.
// 3. If we have an mImageView already, then do nothing because it will have
// already been made the content view or added to the layout.
if (mImageView == null) {
int presplashId = this.resourceManager.getIdentifier("presplash", "drawable");
InputStream is = this.getResources().openRawResource(presplashId);
Expand All @@ -343,12 +344,12 @@ protected void showLoadingScreen() {
ViewGroup.LayoutParams.FILL_PARENT,
ViewGroup.LayoutParams.FILL_PARENT));
mImageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
}

if (mLayout == null) {
setContentView(mImageView);
} else {
mLayout.addView(mImageView);
if (mLayout == null) {
setContentView(mImageView);
} else {
mLayout.addView(mImageView);
}
}
}

Expand Down