Remove Fragment's mInnerView
mInnerView is always set to mView and
updates whenever mView is set, making
it completely redundant.
Test: all tests pass
Change-Id: I9c0ca01b9fc8ca2bd52cc8e365f45ffef2dced1a
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java b/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
index 66bf8df..877e741 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
@@ -214,9 +214,6 @@
// The View generated for this fragment.
View mView;
- // The real inner view that will save/restore state.
- View mInnerView;
-
// Whether this fragment should defer starting until after other fragments
// have been started and their loaders are finished.
boolean mDeferStart;
@@ -573,7 +570,7 @@
final void restoreViewState(Bundle savedInstanceState) {
if (mSavedViewState != null) {
- mInnerView.restoreHierarchyState(mSavedViewState);
+ mView.restoreHierarchyState(mSavedViewState);
mSavedViewState = null;
}
mCalled = false;
@@ -2597,9 +2594,6 @@
if (mView != null) {
writer.print(prefix); writer.print("mView="); writer.println(mView);
}
- if (mInnerView != null) {
- writer.print(prefix); writer.print("mInnerView="); writer.println(mView);
- }
if (getAnimatingAway() != null) {
writer.print(prefix);
writer.print("mAnimatingAway=");
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
index 4cf1fce..6aa018b 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
@@ -1372,7 +1372,6 @@
f.performCreateView(f.performGetLayoutInflater(
f.mSavedFragmentState), container, f.mSavedFragmentState);
if (f.mView != null) {
- f.mInnerView = f.mView;
f.mView.setSaveFromParentEnabled(false);
setViewTag(f);
if (container != null) {
@@ -1389,8 +1388,6 @@
// dispatchOnFragmentViewCreated in case visibility is changed
f.mIsNewlyAdded = (f.mView.getVisibility() == View.VISIBLE)
&& f.mContainer != null;
- } else {
- f.mInnerView = null;
}
}
@@ -1660,7 +1657,6 @@
// the Fragment's view is set to null
fragment.mViewLifecycleOwner = null;
fragment.mViewLifecycleOwnerLiveData.setValue(null);
- fragment.mInnerView = null;
fragment.mInLayout = false;
}
@@ -1673,13 +1669,10 @@
f.performCreateView(f.performGetLayoutInflater(
f.mSavedFragmentState), null, f.mSavedFragmentState);
if (f.mView != null) {
- f.mInnerView = f.mView;
f.mView.setSaveFromParentEnabled(false);
if (f.mHidden) f.mView.setVisibility(View.GONE);
f.onViewCreated(f.mView, f.mSavedFragmentState);
dispatchOnFragmentViewCreated(f, f.mView, f.mSavedFragmentState, false);
- } else {
- f.mInnerView = null;
}
}
}
@@ -2784,7 +2777,7 @@
}
private void saveFragmentViewState(Fragment f) {
- if (f.mInnerView == null) {
+ if (f.mView == null) {
return;
}
if (mStateArray == null) {
@@ -2792,7 +2785,7 @@
} else {
mStateArray.clear();
}
- f.mInnerView.saveHierarchyState(mStateArray);
+ f.mView.saveHierarchyState(mStateArray);
if (mStateArray.size() > 0) {
f.mSavedViewState = mStateArray;
mStateArray = null;
