summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
index 130dcfa..d8de4e1 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
@@ -62,7 +62,10 @@ public class LiveWallpaperActivity extends Activity {
public static class WallpaperDialog extends DialogFragment implements
AdapterView.OnItemClickListener{
+ private static final String EMBEDDED_KEY = "com.android.wallpaper.livepicker."
+ + "LiveWallpaperActivity$WallpaperDialog.EMBEDDED_KEY";
private LiveWallpaperListAdapter mAdapter;
+ private boolean mEmbedded;
public static WallpaperDialog newInstance() {
WallpaperDialog dialog = new WallpaperDialog();
@@ -71,6 +74,21 @@ public class LiveWallpaperActivity extends Activity {
}
@Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (savedInstanceState != null && savedInstanceState.containsKey(EMBEDDED_KEY)) {
+ mEmbedded = savedInstanceState.getBoolean(EMBEDDED_KEY);
+ } else {
+ mEmbedded = isInLayout();
+ }
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ outState.putBoolean(EMBEDDED_KEY, mEmbedded);
+ }
+
+ @Override
public void onDismiss(DialogInterface dialog) {
/* On orientation changes, the dialog is effectively "dismissed" so this is called
* when the activity is no longer associated with this dying dialog fragment. We
@@ -102,7 +120,7 @@ public class LiveWallpaperActivity extends Activity {
* generate a view to display. Otherwise, a dialog will be created in
* onCreateDialog()
*/
- if (isInLayout()) {
+ if (mEmbedded) {
return generateView(inflater, container);
}
return null;