Merge "Create a dark theme for applications to extend." into oc-mr1-jetpack-dev
diff --git a/fragment/src/main/java/android/support/v4/app/FragmentManager.java b/fragment/src/main/java/android/support/v4/app/FragmentManager.java
index f53bc32..141d402 100644
--- a/fragment/src/main/java/android/support/v4/app/FragmentManager.java
+++ b/fragment/src/main/java/android/support/v4/app/FragmentManager.java
@@ -1812,16 +1812,12 @@
mCurState = newState;
if (mActive != null) {
- boolean loadersRunning = false;
// Must add them in the proper order. mActive fragments may be out of order
final int numAdded = mAdded.size();
for (int i = 0; i < numAdded; i++) {
Fragment f = mAdded.get(i);
moveFragmentToExpectedState(f);
- if (f.mLoaderManager != null) {
- loadersRunning |= f.mLoaderManager.hasRunningLoaders();
- }
}
// Now iterate through all active fragments. These will include those that are removed
@@ -1831,15 +1827,10 @@
Fragment f = mActive.valueAt(i);
if (f != null && (f.mRemoving || f.mDetached) && !f.mIsNewlyAdded) {
moveFragmentToExpectedState(f);
- if (f.mLoaderManager != null) {
- loadersRunning |= f.mLoaderManager.hasRunningLoaders();
- }
}
}
- if (!loadersRunning) {
- startPendingDeferredFragments();
- }
+ startPendingDeferredFragments();
if (mNeedMenuInvalidate && mHost != null && mCurState == Fragment.RESUMED) {
mHost.onSupportInvalidateOptionsMenu();
@@ -2692,17 +2683,8 @@
void doPendingDeferredStart() {
if (mHavePendingDeferredStart) {
- boolean loadersRunning = false;
- for (int i = 0; i < mActive.size(); i++) {
- Fragment f = mActive.valueAt(i);
- if (f != null && f.mLoaderManager != null) {
- loadersRunning |= f.mLoaderManager.hasRunningLoaders();
- }
- }
- if (!loadersRunning) {
- mHavePendingDeferredStart = false;
- startPendingDeferredFragments();
- }
+ mHavePendingDeferredStart = false;
+ startPendingDeferredFragments();
}
}
diff --git a/v7/appcompat/src/main/java/android/support/v7/widget/ActivityChooserView.java b/v7/appcompat/src/main/java/android/support/v7/widget/ActivityChooserView.java
index 9979363..1121966 100644
--- a/v7/appcompat/src/main/java/android/support/v7/widget/ActivityChooserView.java
+++ b/v7/appcompat/src/main/java/android/support/v7/widget/ActivityChooserView.java
@@ -90,7 +90,7 @@
/**
* The content of this view.
*/
- private final LinearLayoutCompat mActivityChooserContent;
+ private final View mActivityChooserContent;
/**
* Stores the background drawable to allow hiding and latter showing.