Fix SavedStateProviderTest, FragmentStatesTests
Test: SavedStateProviderTest, FragmentStatesTests
Change-Id: Ide36576b6daec4b76da825ed0702d10d4c8caf77
diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/BaseStateProviderTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/BaseStateProviderTest.java
index 053cf03..b9d2b4f 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/BaseStateProviderTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/BaseStateProviderTest.java
@@ -16,13 +16,12 @@
package com.android.support.lifecycle.state;
-import static com.android.support.lifecycle.HolderFragment.HOLDER_TAG;
import static com.android.support.lifecycle.TestUtils.recreateActivity;
import android.support.test.rule.ActivityTestRule;
import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import com.android.support.lifecycle.HolderFragment;
import com.android.support.lifecycle.testapp.MainActivity;
import com.android.support.lifecycle.testapp.R;
@@ -63,15 +62,15 @@
protected abstract T getStateProvider(MainActivity activity);
private void stopRetainingInstances(MainActivity activity) {
- FragmentManager fragmentManager;
+ Fragment holderFragment;
if (mTestVariant == TestVariant.FRAGMENT) {
Fragment fragment = activity.getSupportFragmentManager()
.findFragmentById(R.id.main_fragment);
- fragmentManager = fragment.getChildFragmentManager();
+ holderFragment = HolderFragment.holderFragmentFor(fragment);
} else {
- fragmentManager = activity.getSupportFragmentManager();
+ holderFragment = HolderFragment.holderFragmentFor(activity);
}
- fragmentManager.findFragmentByTag(HOLDER_TAG).setRetainInstance(false);
+ holderFragment.setRetainInstance(false);
}
@SafeVarargs
diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/FragmentStatesTests.java b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/FragmentStatesTests.java
index 1a54efe..d08685d 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/FragmentStatesTests.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/FragmentStatesTests.java
@@ -16,7 +16,6 @@
package com.android.support.lifecycle.state;
-import static com.android.support.lifecycle.HolderFragment.HOLDER_TAG;
import static com.android.support.lifecycle.TestUtils.recreateActivity;
import static com.android.support.lifecycle.state.StateProviders.savedStateProvider;
@@ -29,6 +28,7 @@
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
+import com.android.support.lifecycle.HolderFragment;
import com.android.support.lifecycle.testapp.MainActivity;
import com.android.support.lifecycle.testapp.R;
import com.android.support.lifecycle.testapp.UsualFragment;
@@ -65,8 +65,7 @@
fragmentManager.beginTransaction().add(R.id.root, fragment, tag).commitNow();
init.run(fragment);
if (forceRecreation) {
- fragment.getChildFragmentManager()
- .findFragmentByTag(HOLDER_TAG).setRetainInstance(false);
+ HolderFragment.holderFragmentFor(fragment).setRetainInstance(false);
}
Fragment newFragment = new UsualFragment();