Update to match fragment APIs.
Change-Id: I25ed185741b1dd16532216110f4610d9082dbc12
diff --git a/src/android/app/patterns/LoaderManagingFragment.java b/src/android/app/patterns/LoaderManagingFragment.java
index 20b5a88..a337b1f 100644
--- a/src/android/app/patterns/LoaderManagingFragment.java
+++ b/src/android/app/patterns/LoaderManagingFragment.java
@@ -143,6 +143,7 @@
mStarted = false;
}
+ /** TO DO: This needs to be turned into a retained fragment.
@Override
public Object onRetainNonConfigurationInstance() {
// Pass the loader along to the next guy
@@ -150,6 +151,7 @@
mLoaders = null;
return result;
}
+ **/
@Override
public void onDestroy() {
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 08c55ef..1de9c55 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -1878,16 +1878,4 @@
}
return mCallOrSmsInitiator;
}
-
- @Override
- protected void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- mListFragment.onSaveInstanceState(outState);
- }
-
- @Override
- protected void onRestoreInstanceState(Bundle savedInstanceState) {
- super.onRestoreInstanceState(savedInstanceState);
- mListFragment.onRestoreInstanceState(savedInstanceState);
- }
}
diff --git a/src/com/android/contacts/MultiplePhonePickerActivity.java b/src/com/android/contacts/MultiplePhonePickerActivity.java
index 6b066a7..8a56d20 100644
--- a/src/com/android/contacts/MultiplePhonePickerActivity.java
+++ b/src/com/android/contacts/MultiplePhonePickerActivity.java
@@ -78,12 +78,6 @@
}
@Override
- protected void onRestoreInstanceState(Bundle icicle) {
- super.onRestoreInstanceState(icicle);
- mListFragment.onRestoreInstanceState(icicle);
- }
-
- @Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
diff --git a/src/com/android/contacts/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
index 80187ad..e24a554 100644
--- a/src/com/android/contacts/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -317,7 +317,17 @@
}
@Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container) {
+ public void onCreate(Bundle savedState) {
+ super.onCreate(savedState);
+ // Retrieve list state. This will be applied in onLoadFinished
+ if (savedState != null) {
+ mListState = savedState.getParcelable(LIST_STATE_KEY);
+ }
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
mView = createView(inflater, container);
mAdapter = createListAdapter();
mAdapter.setSearchMode(isSearchMode());
@@ -551,13 +561,6 @@
}
}
- @Override
- public void onRestoreInstanceState(Bundle icicle) {
- super.onRestoreInstanceState(icicle);
- // Retrieve list state. This will be applied in onLoadFinished
- mListState = icicle.getParcelable(LIST_STATE_KEY);
- }
-
/**
* Restore the list state after the adapter is populated.
*/
diff --git a/src/com/android/contacts/list/MultiplePhonePickerFragment.java b/src/com/android/contacts/list/MultiplePhonePickerFragment.java
index dcf62d7..bf75a9f 100644
--- a/src/com/android/contacts/list/MultiplePhonePickerFragment.java
+++ b/src/com/android/contacts/list/MultiplePhonePickerFragment.java
@@ -130,6 +130,18 @@
}
@Override
+ public void onCreate(Bundle savedState) {
+ super.onCreate(savedState);
+ if (savedState != null) {
+ setSelectedUris(savedState.getParcelableArray(SELECTION_EXTRA_KEY));
+ mSelectionChanged = savedState.getBoolean(SELECTION_CHANGED_EXTRA_KEY, false);
+ if (getAdapter() != null) {
+ getAdapter().setSelectionChanged(mSelectionChanged);
+ }
+ }
+ }
+
+ @Override
public void onResume() {
super.onResume();
updateWidgets();
@@ -166,14 +178,4 @@
icicle.putParcelableArray(SELECTION_EXTRA_KEY, getAdapter().getSelectedUris());
icicle.putBoolean(SELECTION_CHANGED_EXTRA_KEY, getAdapter().isSelectionChanged());
}
-
- @Override
- public void onRestoreInstanceState(Bundle icicle) {
- super.onRestoreInstanceState(icicle);
- setSelectedUris(icicle.getParcelableArray(SELECTION_EXTRA_KEY));
- mSelectionChanged = icicle.getBoolean(SELECTION_CHANGED_EXTRA_KEY, false);
- if (getAdapter() != null) {
- getAdapter().setSelectionChanged(mSelectionChanged);
- }
- }
}
diff --git a/src/com/android/contacts/views/detail/ContactDetailFragment.java b/src/com/android/contacts/views/detail/ContactDetailFragment.java
index 5606272..592c273 100644
--- a/src/com/android/contacts/views/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/views/detail/ContactDetailFragment.java
@@ -166,7 +166,7 @@
}
@Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container) {
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
final View view = inflater.inflate(R.layout.contact_detail, container, false);
mContactHeaderWidget = (ContactHeaderWidget) view.findViewById(R.id.contact_header_widget);
diff --git a/src/com/android/contacts/views/edit/ContactEditFragment.java b/src/com/android/contacts/views/edit/ContactEditFragment.java
index a876972..0511cb3 100644
--- a/src/com/android/contacts/views/edit/ContactEditFragment.java
+++ b/src/com/android/contacts/views/edit/ContactEditFragment.java
@@ -162,7 +162,7 @@
}
@Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container) {
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
final View view = inflater.inflate(R.layout.contact_edit, container, false);
mContent = (LinearLayout) view.findViewById(R.id.editors);
@@ -212,6 +212,19 @@
if (savedState == null) {
// If savedState is non-null, onRestoreInstanceState() will restore the generator.
mViewIdGenerator = new ViewIdGenerator();
+ } else {
+ // Read modifications from instance
+ mState = savedState.<EntitySet> getParcelable(KEY_EDIT_STATE);
+ mRawContactIdRequestingPhoto = savedState.getLong(
+ KEY_RAW_CONTACT_ID_REQUESTING_PHOTO);
+ mViewIdGenerator = savedState.getParcelable(KEY_VIEW_ID_GENERATOR);
+ String fileName = savedState.getString(KEY_CURRENT_PHOTO_FILE);
+ if (fileName != null) {
+ mCurrentPhotoFile = new File(fileName);
+ }
+ mQuerySelection = savedState.getString(KEY_QUERY_SELECTION);
+ mQuerySelectionArgs = savedState.getStringArray(KEY_QUERY_SELECTION_ARGS);
+ mContactIdForJoin = savedState.getLong(KEY_CONTACT_ID_FOR_JOIN);
}
}
@@ -1273,26 +1286,6 @@
super.onSaveInstanceState(outState);
}
- @Override
- public void onRestoreInstanceState(Bundle savedInstanceState) {
- // Read modifications from instance
- mState = savedInstanceState.<EntitySet> getParcelable(KEY_EDIT_STATE);
- mRawContactIdRequestingPhoto = savedInstanceState.getLong(
- KEY_RAW_CONTACT_ID_REQUESTING_PHOTO);
- mViewIdGenerator = savedInstanceState.getParcelable(KEY_VIEW_ID_GENERATOR);
- String fileName = savedInstanceState.getString(KEY_CURRENT_PHOTO_FILE);
- if (fileName != null) {
- mCurrentPhotoFile = new File(fileName);
- }
- mQuerySelection = savedInstanceState.getString(KEY_QUERY_SELECTION);
- mQuerySelectionArgs = savedInstanceState.getStringArray(KEY_QUERY_SELECTION_ARGS);
- mContactIdForJoin = savedInstanceState.getLong(KEY_CONTACT_ID_FOR_JOIN);
-
- bindEditors();
-
- super.onRestoreInstanceState(savedInstanceState);
- }
-
public void onActivityResult(int requestCode, int resultCode, Intent data) {
// Ignore failed requests
if (resultCode != Activity.RESULT_OK) return;