Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "When adding dialog window but not creating update the configuration." into nyc-mr1-dev

Browse Source
This commit is contained in:
Rob Carr
2016-10-07 19:16:00 +00:00
committed by Android (Google) Code Review
parent aea8efbc11 d7dbec7e4c
commit 93becf5148
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/Dialog.java
View File

@@ -32,6 +32,7 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.ContextWrapper; import android.content.ContextWrapper;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.res.Configuration;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
@@ -288,9 +289,14 @@ public class Dialog implements DialogInterface, Window.Callback,
} }
mCanceled = false; mCanceled = false;
if (!mCreated) { if (!mCreated) {
dispatchOnCreate(null); dispatchOnCreate(null);
} else {
// Fill the DecorView in on any configuration changes that
// may have occured while it was removed from the WindowManager.
final Configuration config = mContext.getResources().getConfiguration();
mWindow.getDecorView().dispatchConfigurationChanged(config);
} }
onStart(); onStart();