Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c14b3ab authored by Todd Kennedy's avatar Todd Kennedy Committed by Android Git Automerger
Browse files

am c7e9a17a: am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev 

* commit 'c7e9a17a':
  Remove dependency upon FragmentActivity
parents cc2f85a4 c7e9a17a

api/current.txt

+64 −2
Original line number Diff line number Diff line
@@ -4328,9 +4328,11 @@ package android.app { 
    method public boolean getAllowReturnTransitionOverlap();

    method public final android.os.Bundle getArguments();

    method public final android.app.FragmentManager getChildFragmentManager();

    method public android.content.Context getContext();

    method public android.transition.Transition getEnterTransition();

    method public android.transition.Transition getExitTransition();

    method public final android.app.FragmentManager getFragmentManager();

    method public final java.lang.Object getHost();

    method public final int getId();

    method public android.app.LoaderManager getLoaderManager();

    method public final android.app.Fragment getParentFragment();
@@ -4360,7 +4362,8 @@ package android.app { 
    method public final boolean isVisible();

    method public void onActivityCreated(android.os.Bundle);

    method public void onActivityResult(int, int, android.content.Intent);

    method public void onAttach(android.app.Activity);

    method public void onAttach(android.content.Context);

    method public deprecated void onAttach(android.app.Activity);

    method public void onConfigurationChanged(android.content.res.Configuration);

    method public boolean onContextItemSelected(android.view.MenuItem);

    method public void onCreate(android.os.Bundle);
@@ -4374,7 +4377,8 @@ package android.app { 
    method public void onDetach();

    method public void onHiddenChanged(boolean);

    method public deprecated void onInflate(android.util.AttributeSet, android.os.Bundle);

    method public void onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle);

    method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);

    method public deprecated void onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle);

    method public void onLowMemory();

    method public boolean onOptionsItemSelected(android.view.MenuItem);

    method public void onOptionsMenuClosed(android.view.Menu);
@@ -4441,6 +4445,64 @@ package android.app { 
    method public abstract boolean onBreadCrumbClick(android.app.FragmentManager.BackStackEntry, int);

  }













  public abstract class FragmentContainer {













    ctor public FragmentContainer();













    method public abstract android.view.View onFindViewById(int);













    method public abstract boolean onHasView();













  }

























  public class FragmentController {













    method public void attachHost(android.app.Fragment);













    method public static final android.app.FragmentController createController(android.app.FragmentHostCallback<?>);













    method public void dispatchActivityCreated();













    method public void dispatchConfigurationChanged(android.content.res.Configuration);













    method public boolean dispatchContextItemSelected(android.view.MenuItem);













    method public void dispatchCreate();













    method public boolean dispatchCreateOptionsMenu(android.view.Menu, android.view.MenuInflater);













    method public void dispatchDestroy();













    method public void dispatchDestroyView();













    method public void dispatchLowMemory();













    method public boolean dispatchOptionsItemSelected(android.view.MenuItem);













    method public void dispatchOptionsMenuClosed(android.view.Menu);













    method public void dispatchPause();













    method public boolean dispatchPrepareOptionsMenu(android.view.Menu);













    method public void dispatchResume();













    method public void dispatchStart();













    method public void dispatchStop();













    method public void dispatchTrimMemory(int);













    method public void doLoaderDestroy();













    method public void doLoaderStart();













    method public void doLoaderStop(boolean);













    method public void dumpLoaders(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);













    method public boolean execPendingActions();













    method public android.app.Fragment findFragmentByWho(java.lang.String);













    method public android.app.FragmentManager getFragmentManager();













    method public android.app.LoaderManager getLoaderManager();













    method public void noteStateNotSaved();













    method public android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet);













    method public void reportLoaderStart();













    method public void restoreAllState(android.os.Parcelable, java.util.List<android.app.Fragment>);













    method public void restoreLoaderNonConfig(android.util.ArrayMap<java.lang.String, android.app.LoaderManager>);













    method public android.util.ArrayMap<java.lang.String, android.app.LoaderManager> retainLoaderNonConfig();













    method public java.util.List<android.app.Fragment> retainNonConfig();













    method public android.os.Parcelable saveAllState();













  }

























  public abstract class FragmentHostCallback extends android.app.FragmentContainer {













    ctor public FragmentHostCallback(android.content.Context, android.os.Handler, int);













    method public void onDump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);













    method public android.view.View onFindViewById(int);













    method public abstract E onGetHost();













    method public android.view.LayoutInflater onGetLayoutInflater();













    method public int onGetWindowAnimations();













    method public boolean onHasView();













    method public boolean onHasWindowAnimations();













    method public void onInvalidateOptionsMenu();













    method public boolean onShouldSaveFragmentState(android.app.Fragment);













    method public void onStartActivityFromFragment(android.app.Fragment, android.content.Intent, int, android.os.Bundle);













    method public boolean onUseFragmentManagerInflaterFactory();













  }



























  public abstract class FragmentManager {















    ctor public FragmentManager();















    method public abstract void addOnBackStackChangedListener(android.app.FragmentManager.OnBackStackChangedListener);

























api/system-current.txt



+64
−2




























Original line number
Diff line number
Diff line








@@ -4418,9 +4418,11 @@ package android.app {













    method public boolean getAllowReturnTransitionOverlap();















    method public final android.os.Bundle getArguments();















    method public final android.app.FragmentManager getChildFragmentManager();













    method public android.content.Context getContext();















    method public android.transition.Transition getEnterTransition();















    method public android.transition.Transition getExitTransition();















    method public final android.app.FragmentManager getFragmentManager();













    method public final java.lang.Object getHost();















    method public final int getId();















    method public android.app.LoaderManager getLoaderManager();















    method public final android.app.Fragment getParentFragment();










@@ -4450,7 +4452,8 @@ package android.app {













    method public final boolean isVisible();















    method public void onActivityCreated(android.os.Bundle);















    method public void onActivityResult(int, int, android.content.Intent);













    method public void onAttach(android.app.Activity);













    method public void onAttach(android.content.Context);













    method public deprecated void onAttach(android.app.Activity);















    method public void onConfigurationChanged(android.content.res.Configuration);















    method public boolean onContextItemSelected(android.view.MenuItem);















    method public void onCreate(android.os.Bundle);









@@ -4464,7 +4467,8 @@ package android.app {













    method public void onDetach();















    method public void onHiddenChanged(boolean);















    method public deprecated void onInflate(android.util.AttributeSet, android.os.Bundle);













    method public void onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle);













    method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);













    method public deprecated void onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle);















    method public void onLowMemory();















    method public boolean onOptionsItemSelected(android.view.MenuItem);















    method public void onOptionsMenuClosed(android.view.Menu);










@@ -4531,6 +4535,64 @@ package android.app {













    method public abstract boolean onBreadCrumbClick(android.app.FragmentManager.BackStackEntry, int);















  }



























  public abstract class FragmentContainer {













    ctor public FragmentContainer();













    method public abstract android.view.View onFindViewById(int);













    method public abstract boolean onHasView();













  }

























  public class FragmentController {













    method public void attachHost(android.app.Fragment);













    method public static final android.app.FragmentController createController(android.app.FragmentHostCallback<?>);













    method public void dispatchActivityCreated();













    method public void dispatchConfigurationChanged(android.content.res.Configuration);













    method public boolean dispatchContextItemSelected(android.view.MenuItem);













    method public void dispatchCreate();













    method public boolean dispatchCreateOptionsMenu(android.view.Menu, android.view.MenuInflater);













    method public void dispatchDestroy();













    method public void dispatchDestroyView();













    method public void dispatchLowMemory();













    method public boolean dispatchOptionsItemSelected(android.view.MenuItem);













    method public void dispatchOptionsMenuClosed(android.view.Menu);













    method public void dispatchPause();













    method public boolean dispatchPrepareOptionsMenu(android.view.Menu);













    method public void dispatchResume();













    method public void dispatchStart();













    method public void dispatchStop();













    method public void dispatchTrimMemory(int);













    method public void doLoaderDestroy();













    method public void doLoaderStart();













    method public void doLoaderStop(boolean);













    method public void dumpLoaders(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);













    method public boolean execPendingActions();













    method public android.app.Fragment findFragmentByWho(java.lang.String);













    method public android.app.FragmentManager getFragmentManager();













    method public android.app.LoaderManager getLoaderManager();













    method public void noteStateNotSaved();













    method public android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet);













    method public void reportLoaderStart();













    method public void restoreAllState(android.os.Parcelable, java.util.List<android.app.Fragment>);













    method public void restoreLoaderNonConfig(android.util.ArrayMap<java.lang.String, android.app.LoaderManager>);













    method public android.util.ArrayMap<java.lang.String, android.app.LoaderManager> retainLoaderNonConfig();













    method public java.util.List<android.app.Fragment> retainNonConfig();













    method public android.os.Parcelable saveAllState();













  }

























  public abstract class FragmentHostCallback extends android.app.FragmentContainer {













    ctor public FragmentHostCallback(android.content.Context, android.os.Handler, int);













    method public void onDump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);













    method public android.view.View onFindViewById(int);













    method public abstract E onGetHost();













    method public android.view.LayoutInflater onGetLayoutInflater();













    method public int onGetWindowAnimations();













    method public boolean onHasView();













    method public boolean onHasWindowAnimations();













    method public void onInvalidateOptionsMenu();













    method public boolean onShouldSaveFragmentState(android.app.Fragment);













    method public void onStartActivityFromFragment(android.app.Fragment, android.content.Intent, int, android.os.Bundle);













    method public boolean onUseFragmentManagerInflaterFactory();













  }



























  public abstract class FragmentManager {















    ctor public FragmentManager();















    method public abstract void addOnBackStackChangedListener(android.app.FragmentManager.OnBackStackChangedListener);

























core/java/android/app/Activity.java



+91
−124




























Original line number
Diff line number
Diff line








@@ -108,6 +108,7 @@ import java.lang.annotation.Retention;













import java.lang.annotation.RetentionPolicy;















import java.util.ArrayList;















import java.util.HashMap;













import java.util.List;































/**















 * An activity is a single, focused thing that the user can do.  Almost all










@@ -706,8 +707,6 @@ public class Activity extends ContextThemeWrapper













    /*package*/ ActivityThread mMainThread;















    Activity mParent;















    boolean mCalled;













    boolean mCheckedForLoaderManager;













    boolean mLoadersStarted;















    /*package*/ boolean mResumed;















    private boolean mStopped;















    boolean mFinished;









@@ -726,8 +725,8 @@ public class Activity extends ContextThemeWrapper













    static final class NonConfigurationInstances {















        Object activity;















        HashMap<String, Object> children;













        ArrayList<Fragment> fragments;













        ArrayMap<String, LoaderManagerImpl> loaders;













        List<Fragment> fragments;













        ArrayMap<String, LoaderManager> loaders;















        VoiceInteractor voiceInteractor;















    }















    /* package */ NonConfigurationInstances mLastNonConfigurationInstances;









@@ -747,26 +746,13 @@ public class Activity extends ContextThemeWrapper













    private CharSequence mTitle;















    private int mTitleColor = 0;





























    final FragmentManagerImpl mFragments = new FragmentManagerImpl();













    final FragmentContainer mContainer = new FragmentContainer() {













        @Override













        @Nullable













        public View findViewById(int id) {













            return Activity.this.findViewById(id);













        }













        @Override













        public boolean hasView() {













            Window window = Activity.this.getWindow();













            return (window != null && window.peekDecorView() != null);













        }













    };













    // we must have a handler before the FragmentController is constructed













    final Handler mHandler = new Handler();













    final FragmentController mFragments = FragmentController.createController(new HostCallbacks());































    // Most recent call to requestVisibleBehind().















    boolean mVisibleBehind;





























    ArrayMap<String, LoaderManagerImpl> mAllLoaderManagers;













    LoaderManagerImpl mLoaderManager;





























    private static final class ManagedCursor {















        ManagedCursor(Cursor cursor) {















            mCursor = cursor;










@@ -802,7 +788,6 @@ public class Activity extends ContextThemeWrapper













    private final Object mInstanceTracker = StrictMode.trackActivity(this);































    private Thread mUiThread;













    final Handler mHandler = new Handler();































    ActivityTransitionState mActivityTransitionState = new ActivityTransitionState();















    SharedElementCallback mEnterTransitionListener = SharedElementCallback.NULL_CALLBACK;










@@ -863,28 +848,7 @@ public class Activity extends ContextThemeWrapper













     * Return the LoaderManager for this activity, creating it if needed.















     */















    public LoaderManager getLoaderManager() {













        if (mLoaderManager != null) {













            return mLoaderManager;













        }













        mCheckedForLoaderManager = true;













        mLoaderManager = getLoaderManager("(root)", mLoadersStarted, true);













        return mLoaderManager;













    }



























    LoaderManagerImpl getLoaderManager(String who, boolean started, boolean create) {













        if (mAllLoaderManagers == null) {













            mAllLoaderManagers = new ArrayMap<String, LoaderManagerImpl>();













        }













        LoaderManagerImpl lm = mAllLoaderManagers.get(who);













        if (lm == null) {













            if (create) {













                lm = new LoaderManagerImpl(who, this, started);













                mAllLoaderManagers.put(who, lm);













            }













        } else {













            lm.updateActivity(this);













        }













        return lm;













        return mFragments.getLoaderManager();















    }































    /**










@@ -931,7 +895,7 @@ public class Activity extends ContextThemeWrapper













    protected void onCreate(@Nullable Bundle savedInstanceState) {















        if (DEBUG_LIFECYCLE) Slog.v(TAG, "onCreate " + this + ": " + savedInstanceState);















        if (mLastNonConfigurationInstances != null) {













            mAllLoaderManagers = mLastNonConfigurationInstances.loaders;













            mFragments.restoreLoaderNonConfig(mLastNonConfigurationInstances.loaders);















        }















        if (mActivityInfo.parentActivityName != null) {















            if (mActionBar == null) {










@@ -1172,15 +1136,7 @@ public class Activity extends ContextThemeWrapper













        if (DEBUG_LIFECYCLE) Slog.v(TAG, "onStart " + this);















        mCalled = true;





























        if (!mLoadersStarted) {













            mLoadersStarted = true;













            if (mLoaderManager != null) {













                mLoaderManager.doStart();













            } else if (!mCheckedForLoaderManager) {













                mLoaderManager = getLoaderManager("(root)", mLoadersStarted, false);













            }













            mCheckedForLoaderManager = true;













        }













        mFragments.doLoaderStart();































        getApplication().dispatchActivityStarted(this);















    }










@@ -1873,27 +1829,9 @@ public class Activity extends ContextThemeWrapper













    NonConfigurationInstances retainNonConfigurationInstances() {















        Object activity = onRetainNonConfigurationInstance();















        HashMap<String, Object> children = onRetainNonConfigurationChildInstances();













        ArrayList<Fragment> fragments = mFragments.retainNonConfig();













        boolean retainLoaders = false;













        if (mAllLoaderManagers != null) {













            // prune out any loader managers that were already stopped and so













            // have nothing useful to retain.













            final int N = mAllLoaderManagers.size();













            LoaderManagerImpl loaders[] = new LoaderManagerImpl[N];













            for (int i=N-1; i>=0; i--) {













                loaders[i] = mAllLoaderManagers.valueAt(i);













            }













            for (int i=0; i<N; i++) {













                LoaderManagerImpl lm = loaders[i];













                if (lm.mRetaining) {













                    retainLoaders = true;













                } else {













                    lm.doDestroy();













                    mAllLoaderManagers.remove(lm.mWho);













                }













            }













        }













        if (activity == null && children == null && fragments == null && !retainLoaders













        List<Fragment> fragments = mFragments.retainNonConfig();













        ArrayMap<String, LoaderManager> loaders = mFragments.retainLoaderNonConfig();













        if (activity == null && children == null && fragments == null && loaders == null















                && mVoiceInteractor == null) {















            return null;















        }









@@ -1902,7 +1840,7 @@ public class Activity extends ContextThemeWrapper













        nci.activity = activity;















        nci.children = children;















        nci.fragments = fragments;













        nci.loaders = mAllLoaderManagers;













        nci.loaders = loaders;















        nci.voiceInteractor = mVoiceInteractor;















        return nci;















    }









@@ -1924,18 +1862,7 @@ public class Activity extends ContextThemeWrapper













     * with this activity.















     */















    public FragmentManager getFragmentManager() {













        return mFragments;













    }



























    void invalidateFragment(String who) {













        //Log.v(TAG, "invalidateFragmentIndex: index=" + index);













        if (mAllLoaderManagers != null) {













            LoaderManagerImpl lm = mAllLoaderManagers.get(who);













            if (lm != null && !lm.mRetaining) {













                lm.doDestroy();













                mAllLoaderManagers.remove(who);













            }













        }













        return mFragments.getFragmentManager();















    }































    /**










@@ -2518,7 +2445,7 @@ public class Activity extends ContextThemeWrapper













            return;















        }





























        if (!mFragments.popBackStackImmediate()) {













        if (!mFragments.getFragmentManager().popBackStackImmediate()) {















            finishAfterTransition();















        }















    }










@@ -5518,21 +5445,13 @@ public class Activity extends ContextThemeWrapper













                writer.print(mResumed); writer.print(" mStopped=");















                writer.print(mStopped); writer.print(" mFinished=");















                writer.println(mFinished);













        writer.print(innerPrefix); writer.print("mLoadersStarted=");













                writer.println(mLoadersStarted);















        writer.print(innerPrefix); writer.print("mChangingConfigurations=");















                writer.println(mChangingConfigurations);















        writer.print(innerPrefix); writer.print("mCurrentConfig=");















                writer.println(mCurrentConfig);





























        if (mLoaderManager != null) {













            writer.print(prefix); writer.print("Loader Manager ");













                    writer.print(Integer.toHexString(System.identityHashCode(mLoaderManager)));













                    writer.println(":");













            mLoaderManager.dump(prefix + "  ", fd, writer, args);













        }



























        mFragments.dump(prefix, fd, writer, args);













        mFragments.dumpLoaders(innerPrefix, fd, writer, args);













        mFragments.getFragmentManager().dump(innerPrefix, fd, writer, args);































        if (getWindow() != null &&















                getWindow().peekDecorView() != null &&










@@ -6128,7 +6047,7 @@ public class Activity extends ContextThemeWrapper













            Configuration config, String referrer, IVoiceInteractor voiceInteractor) {















        attachBaseContext(context);





























        mFragments.attachActivity(this, mContainer, null);













        mFragments.attachHost(null /*parent*/);































        mWindow = new PhoneWindow(this);















        mWindow.setCallback(this);










@@ -6211,18 +6130,7 @@ public class Activity extends ContextThemeWrapper













                " did not call through to super.onStart()");















        }















        mFragments.dispatchStart();













        if (mAllLoaderManagers != null) {













            final int N = mAllLoaderManagers.size();













            LoaderManagerImpl loaders[] = new LoaderManagerImpl[N];













            for (int i=N-1; i>=0; i--) {













                loaders[i] = mAllLoaderManagers.valueAt(i);













            }













            for (int i=0; i<N; i++) {













                LoaderManagerImpl lm = loaders[i];













                lm.finishRetain();













                lm.doReportStart();













            }













        }













        mFragments.reportLoaderStart();















        mActivityTransitionState.enterReady(this);















    }


























@@ -6328,16 +6236,7 @@ public class Activity extends ContextThemeWrapper





























    final void performStop() {















        mDoReportFullyDrawn = false;













        if (mLoadersStarted) {













            mLoadersStarted = false;













            if (mLoaderManager != null) {













                if (!mChangingConfigurations) {













                    mLoaderManager.doStop();













                } else {













                    mLoaderManager.doRetain();













                }













            }













        }













        mFragments.doLoaderStop(mChangingConfigurations /*retain*/);































        if (!mStopped) {















            if (mWindow != null) {










@@ -6379,9 +6278,7 @@ public class Activity extends ContextThemeWrapper













        mWindow.destroy();















        mFragments.dispatchDestroy();















        onDestroy();













        if (mLoaderManager != null) {













            mLoaderManager.doDestroy();













        }













        mFragments.doLoaderDestroy();















        if (mVoiceInteractor != null) {















            mVoiceInteractor.detachActivity();















        }










@@ -6541,4 +6438,74 @@ public class Activity extends ContextThemeWrapper













        return intent != null















                && PackageManager.ACTION_REQUEST_PERMISSIONS.equals(intent.getAction());















    }



























    class HostCallbacks extends FragmentHostCallback<Activity> {













        public HostCallbacks() {













            super(Activity.this /*activity*/);













        }



























        @Override













        public void onDump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {













            Activity.this.dump(prefix, fd, writer, args);













        }



























        @Override













        public boolean onShouldSaveFragmentState(Fragment fragment) {













            return !isFinishing();













        }



























        @Override













        public LayoutInflater onGetLayoutInflater() {













            final LayoutInflater result = Activity.this.getLayoutInflater();













            if (onUseFragmentManagerInflaterFactory()) {













                return result.cloneInContext(Activity.this);













            }













            return result;













        }



























        @Override













        public boolean onUseFragmentManagerInflaterFactory() {













            // Newer platform versions use the child fragment manager's LayoutInflaterFactory.













            return getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP;













        }



























        @Override













        public Activity onGetHost() {













            return Activity.this;













        }



























        @Override













        public void onInvalidateOptionsMenu() {













            Activity.this.invalidateOptionsMenu();













        }



























        @Override













        public void onStartActivityFromFragment(Fragment fragment, Intent intent, int requestCode,













                Bundle options) {













            Activity.this.startActivityFromFragment(fragment, intent, requestCode, options);













        }



























        @Override













        public boolean onHasWindowAnimations() {













            return getWindow() != null;













        }



























        @Override













        public int onGetWindowAnimations() {













            final Window w = getWindow();













            return (w == null) ? 0 : w.getAttributes().windowAnimations;













        }



























        @Nullable













        @Override













        public View onFindViewById(int id) {













            return Activity.this.findViewById(id);













        }



























        @Override













        public boolean onHasView() {













            final Window w = getWindow();













            return (w != null && w.peekDecorView() != null);













        }













    }















}
























core/java/android/app/BackStackRecord.java



+6
−6


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/app/DialogFragment.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -410,7 +410,7 @@ public class DialogFragment extends Fragment













            return (LayoutInflater)mDialog.getContext().getSystemService(















                    Context.LAYOUT_INFLATER_SERVICE);















        }













        return (LayoutInflater)mActivity.getSystemService(













        return (LayoutInflater) mHost.getContext().getSystemService(















                Context.LAYOUT_INFLATER_SERVICE);















    }