PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2eb32b00: Merge "Prevent orphaned fragment on the settings stack." into ics-mr1

Browse Source 
* commit '2eb32b00775b6e308e1c422856c1046c6c33b54a':
  Prevent orphaned fragment on the settings stack.
This commit is contained in:
Amith Yamasani
2011-11-09 21:19:22 +00:00
committed by Android Git Automerger
parent 8de5cf5126 2eb32b0077
commit a2ca9269f2
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/DataUsageSummary.java
View File

@@ -49,6 +49,7 @@ import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.DialogFragment; import android.app.DialogFragment;
import android.app.Fragment; import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction; import android.app.FragmentTransaction;
import android.app.LoaderManager.LoaderCallbacks; import android.app.LoaderManager.LoaderCallbacks;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -518,6 +519,15 @@ public class DataUsageSummary extends Fragment {
mUidDetailProvider = null; mUidDetailProvider = null;
} }
@Override
public void onDestroy() {
if (this.isRemoving()) {
getFragmentManager()
.popBackStack(TAG_APP_DETAILS, FragmentManager.POP_BACK_STACK_INCLUSIVE);
}
super.onDestroy();
}
/** /**
* Listener to setup {@link LayoutTransition} after first layout pass. * Listener to setup {@link LayoutTransition} after first layout pass.
*/ */
@@ -1502,7 +1512,6 @@ public class DataUsageSummary extends Fragment {
final AppDetailsFragment fragment = new AppDetailsFragment(); final AppDetailsFragment fragment = new AppDetailsFragment();
fragment.setArguments(args); fragment.setArguments(args);
fragment.setTargetFragment(parent, 0); fragment.setTargetFragment(parent, 0);
final FragmentTransaction ft = parent.getFragmentManager().beginTransaction(); final FragmentTransaction ft = parent.getFragmentManager().beginTransaction();
ft.add(fragment, TAG_APP_DETAILS); ft.add(fragment, TAG_APP_DETAILS);
ft.addToBackStack(TAG_APP_DETAILS); ft.addToBackStack(TAG_APP_DETAILS);