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

Merge "Change getFragments() to return a List." into oc-dev

Browse Source 
am: 1b2bedcd76

Change-Id: I59407dbe9e307e30bb721e33423130615ff00a7c
This commit is contained in:
George Mount
2017-04-06 00:22:01 +00:00
committed by android-build-merger
parent 58e1a90ba9 1b2bedcd76
commit b71472d28e
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -4771,7 +4771,7 @@ package android.app {
method public abstract android.app.FragmentManager.BackStackEntry getBackStackEntryAt(int);
method public abstract int getBackStackEntryCount();
method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String);
method public abstract java.util.Collection<android.app.Fragment> getFragments();
method public abstract java.util.List<android.app.Fragment> getFragments();
method public abstract android.app.Fragment getPrimaryNavigationFragment();
method public void invalidateOptionsMenu();
method public abstract boolean isDestroyed();

2
api/system-current.txt
View File

@@ -4931,7 +4931,7 @@ package android.app {
method public abstract android.app.FragmentManager.BackStackEntry getBackStackEntryAt(int);
method public abstract int getBackStackEntryCount();
method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String);
method public abstract java.util.Collection<android.app.Fragment> getFragments();
method public abstract java.util.List<android.app.Fragment> getFragments();
method public abstract android.app.Fragment getPrimaryNavigationFragment();
method public void invalidateOptionsMenu();
method public abstract boolean isDestroyed();

2
api/test-current.txt
View File

@@ -4783,7 +4783,7 @@ package android.app {
method public abstract android.app.FragmentManager.BackStackEntry getBackStackEntryAt(int);
method public abstract int getBackStackEntryCount();
method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String);
method public abstract java.util.Collection<android.app.Fragment> getFragments();
method public abstract java.util.List<android.app.Fragment> getFragments();
method public abstract android.app.Fragment getPrimaryNavigationFragment();
method public void invalidateOptionsMenu();
method public abstract boolean isDestroyed();

13
core/java/android/app/FragmentManager.java
View File

@@ -314,14 +314,17 @@ public abstract class FragmentManager {
public abstract Fragment getFragment(Bundle bundle, String key);
/**
* Get a collection of all fragments that are currently added to the FragmentManager.
* Get a list of all fragments that are currently added to the FragmentManager.
* This may include those that are hidden as well as those that are shown.
* This will not include any fragments only in the back stack, or fragments that
* are detached or removed.
* <p>
* The order of the fragments in the list is the order in which they were
* added or attached.
*
* @return A collection of all fragments that are added to the FragmentManager.
* @return A list of all fragments that are added to the FragmentManager.
*/
public abstract Collection<Fragment> getFragments();
public abstract List<Fragment> getFragments();
/**
* Save the current instance state of the given Fragment. This can be
@@ -907,12 +910,12 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
}
@Override
public Collection<Fragment> getFragments() {
public List<Fragment> getFragments() {
if (mAdded == null) {
return Collections.EMPTY_LIST;
}
synchronized (mAdded) {
return (Collection<Fragment>) mAdded.clone();
return (List<Fragment>) mAdded.clone();
}
}