drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make public getFragments() and onGetLayoutInflater() methods

Browse Source 
Bug 34703669
Test: I846ef668e3dd7d664cfb56d2b9400467ba9b79f4
Change-Id: Ie202960ada86b25e964f98a639b5f5740c8fdb79
This commit is contained in:
George Mount
2017-03-29 14:13:03 +00:00
parent 92b3242827
commit c7146beabe
7 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@ -4609,6 +4609,7 @@ package android.app {
method public void onDestroyOptionsMenu();
method public void onDestroyView();
method public void onDetach();
method public android.view.LayoutInflater onGetLayoutInflater(android.os.Bundle);
method public void onHiddenChanged(boolean);
method public deprecated void onInflate(android.util.AttributeSet, android.os.Bundle);
method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);
@ -4763,6 +4764,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 android.app.Fragment getPrimaryNavigationFragment();
method public void invalidateOptionsMenu();
method public abstract boolean isDestroyed();

2
api/system-current.txt
View File

@ -4768,6 +4768,7 @@ package android.app {
method public void onDestroyOptionsMenu();
method public void onDestroyView();
method public void onDetach();
method public android.view.LayoutInflater onGetLayoutInflater(android.os.Bundle);
method public void onHiddenChanged(boolean);
method public deprecated void onInflate(android.util.AttributeSet, android.os.Bundle);
method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);
@ -4922,6 +4923,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 android.app.Fragment getPrimaryNavigationFragment();
method public void invalidateOptionsMenu();
method public abstract boolean isDestroyed();

2
api/test-current.txt
View File

@ -4621,6 +4621,7 @@ package android.app {
method public void onDestroyOptionsMenu();
method public void onDestroyView();
method public void onDetach();
method public android.view.LayoutInflater onGetLayoutInflater(android.os.Bundle);
method public void onHiddenChanged(boolean);
method public deprecated void onInflate(android.util.AttributeSet, android.os.Bundle);
method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);
@ -4775,6 +4776,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 android.app.Fragment getPrimaryNavigationFragment();
method public void invalidateOptionsMenu();
method public abstract boolean isDestroyed();

4
core/java/android/app/DialogFragment.java
View File

@ -398,9 +398,9 @@ public class DialogFragment extends Fragment
/** @hide */
@Override
public LayoutInflater getLayoutInflater(Bundle savedInstanceState) {
public LayoutInflater onGetLayoutInflater(Bundle savedInstanceState) {
if (!mShowsDialog) {
return super.getLayoutInflater(savedInstanceState);
return super.onGetLayoutInflater(savedInstanceState);
}
mDialog = onCreateDialog(savedInstanceState);

14
core/java/android/app/Fragment.java
View File

@ -31,7 +31,6 @@ import android.content.res.TypedArray;
import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.Parcel;
import android.os.Parcelable;
@ -1357,11 +1356,16 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
}
/**
* @hide Hack so that DialogFragment can make its Dialog before creating
* its views, and the view construction can use the dialog's context for
* inflation. Maybe this should become a public API. Note sure.
* Returns the LayoutInflater used to inflate Views of this Fragment. The default
* implementation will throw an exception if the Fragment is not attached.
*
* @return The LayoutInflater used to inflate Views of this Fragment.
*/
public LayoutInflater getLayoutInflater(Bundle savedInstanceState) {
public LayoutInflater onGetLayoutInflater(Bundle savedInstanceState) {
if (mHost == null) {
throw new IllegalStateException("onGetLayoutInflater() cannot be executed until the "
+ "Fragment is attached to the FragmentManager.");
}
final LayoutInflater result = mHost.onGetLayoutInflater();
if (mHost.onUseFragmentManagerInflaterFactory()) {
getChildFragmentManager(); // Init if needed; use raw implementation below.

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

@ -54,6 +54,8 @@ import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@ -311,6 +313,16 @@ 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.
* 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.
*
* @return A collection of all fragments that are added to the FragmentManager.
*/
public abstract Collection<Fragment> getFragments();
/**
* Save the current instance state of the given Fragment. This can be
* used later when creating a new instance of the Fragment and adding
@ -894,6 +906,16 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
return f;
}
@Override
public Collection<Fragment> getFragments() {
if (mAdded == null) {
return Collections.EMPTY_LIST;
}
synchronized (mAdded) {
return (Collection<Fragment>) mAdded.clone();
}
}
@Override
public Fragment.SavedState saveFragmentInstanceState(Fragment fragment) {
if (fragment.mIndex < 0) {
@ -1226,7 +1248,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
}
}
f.mContainer = container;
f.mView = f.performCreateView(f.getLayoutInflater(
f.mView = f.performCreateView(f.onGetLayoutInflater(
f.mSavedFragmentState), container, f.mSavedFragmentState);
if (f.mView != null) {
f.mView.setSaveFromParentEnabled(false);
@ -1398,7 +1420,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
void ensureInflatedFragmentView(Fragment f) {
if (f.mFromLayout && !f.mPerformedCreateView) {
f.mView = f.performCreateView(f.getLayoutInflater(
f.mView = f.performCreateView(f.onGetLayoutInflater(
f.mSavedFragmentState), null, f.mSavedFragmentState);
if (f.mView != null) {
f.mView.setSaveFromParentEnabled(false);
@ -1620,7 +1642,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
if (mAdded.contains(fragment)) {
throw new IllegalStateException("Fragment already added: " + fragment);
}
mAdded.add(fragment);
synchronized (mAdded) {
mAdded.add(fragment);
}
fragment.mAdded = true;
fragment.mRemoving = false;
if (fragment.mView == null) {
@ -1648,7 +1672,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
}
}
if (mAdded != null) {
mAdded.remove(fragment);
synchronized (mAdded) {
mAdded.remove(fragment);
}
}
if (fragment.mHasMenu && fragment.mMenuVisible) {
mNeedMenuInvalidate = true;
@ -1698,7 +1724,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
// We are not already in back stack, so need to remove the fragment.
if (mAdded != null) {
if (DEBUG) Log.v(TAG, "remove from detach: " + fragment);
mAdded.remove(fragment);
synchronized (mAdded) {
mAdded.remove(fragment);
}
}
if (fragment.mHasMenu && fragment.mMenuVisible) {
mNeedMenuInvalidate = true;
@ -1720,7 +1748,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
throw new IllegalStateException("Fragment already added: " + fragment);
}
if (DEBUG) Log.v(TAG, "add from attach: " + fragment);
mAdded.add(fragment);
synchronized (mAdded) {
mAdded.add(fragment);
}
fragment.mAdded = true;
if (fragment.mHasMenu && fragment.mMenuVisible) {
mNeedMenuInvalidate = true;
@ -2762,7 +2792,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
if (mAdded.contains(f)) {
throw new IllegalStateException("Already added!");
}
mAdded.add(f);
synchronized (mAdded) {
mAdded.add(f);
}
}
} else {
mAdded = null;

4
packages/SystemUI/plugin/src/com/android/systemui/plugins/PluginFragment.java
View File

@ -29,8 +29,8 @@ public abstract class PluginFragment extends Fragment implements Plugin {
}
@Override
public LayoutInflater getLayoutInflater(Bundle savedInstanceState) {
return super.getLayoutInflater(savedInstanceState).cloneInContext(getContext());
public LayoutInflater onGetLayoutInflater(Bundle savedInstanceState) {
return super.onGetLayoutInflater(savedInstanceState).cloneInContext(getContext());
}
@Override