summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2010-12-06 15:42:03 -0800
committerAdam Lesinski <adamlesinski@google.com>2010-12-06 17:25:39 -0800
commitd6bb51406fa63d93bf634b64e9f115e49a9c9c29 (patch)
treecbfb62607f9795300d6ea5e3b1f65492faa8891e
parent0ab0466df1edeb03700069a9989bf1ee30ce8fdf (diff)
downloadandroid_packages_wallpapers_LivePicker-d6bb51406fa63d93bf634b64e9f115e49a9c9c29.zip
android_packages_wallpapers_LivePicker-d6bb51406fa63d93bf634b64e9f115e49a9c9c29.tar.gz
android_packages_wallpapers_LivePicker-d6bb51406fa63d93bf634b64e9f115e49a9c9c29.tar.bz2
Fixed bug in orientation change
-The Fragment was missing an empty public constructor b/3257935 -Restructured some of the logic determining whether to show a dialog or an embedded view Change-Id: I42295ef88cd800b775ea6970c59c34cb46ca17d5
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/layout-xlarge/live_wallpaper_base.xml19
-rw-r--r--res/layout/live_wallpaper_base.xml8
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java (renamed from src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java)66
4 files changed, 59 insertions, 36 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2d8ae50..6a5d677 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,7 +31,7 @@
android:label="@string/application_name"
android:icon="@drawable/ic_launcher_live_wallpaper">
- <activity android:name="LiveWallpaperListActivity"
+ <activity android:name="LiveWallpaperActivity"
android:icon="@drawable/ic_launcher_live_wallpaper"
android:label="@string/live_wallpaper_picker_title"
android:theme="@style/LivePickerTheme"
diff --git a/res/layout-xlarge/live_wallpaper_base.xml b/res/layout-xlarge/live_wallpaper_base.xml
new file mode 100644
index 0000000..a8e61d5
--- /dev/null
+++ b/res/layout-xlarge/live_wallpaper_base.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
diff --git a/res/layout/live_wallpaper_base.xml b/res/layout/live_wallpaper_base.xml
index 6803901..41cbdf1 100644
--- a/res/layout/live_wallpaper_base.xml
+++ b/res/layout/live_wallpaper_base.xml
@@ -15,6 +15,10 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/live_wallpaper_base_view"
android:layout_width="match_parent"
- android:layout_height="match_parent"/>
+ android:layout_height="match_parent">
+ <fragment class="com.android.wallpaper.livepicker.LiveWallpaperListActivity$WallpaperDialog"
+ android:id="@+id/live_wallpaper_fragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+</FrameLayout>
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
index c96e18c..130dcfa 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
@@ -20,12 +20,11 @@ import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
-import android.app.FragmentTransaction;
+import android.app.Fragment;
import android.app.WallpaperInfo;
import android.os.Bundle;
import android.content.DialogInterface;
import android.content.Intent;
-import android.content.res.Configuration;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -33,28 +32,22 @@ import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
-public class LiveWallpaperListActivity extends Activity {
+public class LiveWallpaperActivity extends Activity {
private static final String LOG_TAG = "LiveWallpapersPicker";
private static final int REQUEST_PREVIEW = 100;
-
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.live_wallpaper_base);
- ViewGroup baseView = (ViewGroup) findViewById(R.id.live_wallpaper_base_view);
-
- boolean isXLarge = (getResources().getConfiguration().screenLayout
- & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE;
- DialogFragment fragment = new WallpaperDialogFragment(this, baseView, !isXLarge);
- if (isXLarge) {
- // When the screen is XLarge
+ Fragment fragmentView = getFragmentManager().findFragmentById(R.id.live_wallpaper_fragment);
+ if (fragmentView == null) {
+ /* When the screen is XLarge, the fragment is not included in the layout, so show it
+ * as a dialog
+ */
+ DialogFragment fragment = WallpaperDialog.newInstance();
fragment.show(getFragmentManager(), "dialog");
- } else {
- // When the screen is normal. i.e: a phone
- FragmentTransaction ft = getFragmentManager().openTransaction();
- ft.add(R.id.live_wallpaper_base_view, fragment);
- ft.commit();
}
}
@@ -67,32 +60,35 @@ public class LiveWallpaperListActivity extends Activity {
}
}
- private class WallpaperDialogFragment extends DialogFragment implements
+ public static class WallpaperDialog extends DialogFragment implements
AdapterView.OnItemClickListener{
- private Activity mActivity;
private LiveWallpaperListAdapter mAdapter;
- private ViewGroup mBaseView;
- private boolean mEmbedded;
-
- public WallpaperDialogFragment(Activity activity, ViewGroup baseView, boolean embedded) {
- mActivity = activity;
- mEmbedded = embedded;
- mBaseView = baseView;
- setCancelable(true);
+
+ public static WallpaperDialog newInstance() {
+ WallpaperDialog dialog = new WallpaperDialog();
+ dialog.setCancelable(true);
+ return dialog;
}
@Override
public void onDismiss(DialogInterface dialog) {
- mActivity.finish();
+ /* 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
+ * should just safely ignore this case by checking if getActivity() returns null
+ */
+ Activity activity = getActivity();
+ if (activity != null) {
+ activity.finish();
+ }
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final int contentInset = getResources().getDimensionPixelSize(
R.dimen.dialog_content_inset);
- View view = generateView(getLayoutInflater(), mBaseView);
+ View view = generateView(getActivity().getLayoutInflater(), null);
- AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
+ AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setNegativeButton(R.string.wallpaper_cancel, null);
builder.setTitle(R.string.live_wallpaper_picker_title);
builder.setView(view, contentInset, contentInset, contentInset, contentInset);
@@ -102,17 +98,21 @@ public class LiveWallpaperListActivity extends Activity {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- if (mEmbedded) {
+ /* If this fragment is embedded in the layout of this activity, then we should
+ * generate a view to display. Otherwise, a dialog will be created in
+ * onCreateDialog()
+ */
+ if (isInLayout()) {
return generateView(inflater, container);
}
- return super.onCreateView(inflater, container, savedInstanceState);
+ return null;
}
@SuppressWarnings("unchecked")
private View generateView(LayoutInflater inflater, ViewGroup container) {
View layout = inflater.inflate(R.layout.live_wallpaper_list, container, false);
- mAdapter = new LiveWallpaperListAdapter(mActivity);
+ mAdapter = new LiveWallpaperListAdapter(getActivity());
AdapterView<BaseAdapter> adapterView =
(AdapterView<BaseAdapter>) layout.findViewById(android.R.id.list);
adapterView.setAdapter(mAdapter);
@@ -126,7 +126,7 @@ public class LiveWallpaperListActivity extends Activity {
(LiveWallpaperListAdapter.LiveWallpaperInfo) mAdapter.getItem(position);
final Intent intent = wallpaperInfo.intent;
final WallpaperInfo info = wallpaperInfo.info;
- LiveWallpaperPreview.showPreview(mActivity, REQUEST_PREVIEW, intent, info);
+ LiveWallpaperPreview.showPreview(getActivity(), REQUEST_PREVIEW, intent, info);
}
}
}