am bf6d50f9: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev

* commit 'bf6d50f906b33a7ace8a04f6b87826a8dca05db9':
  Call dispatchFinishTemporaryDetach before returning a transient view
This commit is contained in:
Alan Viverette
2015-05-13 23:44:57 +00:00
committed by Android Git Automerger

View File

@@ -2353,8 +2353,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
}
}
// Scrap view implies temporary detachment.
isScrap[0] = true;
// Finish the temporary detach started in addScrapView().
transientView.dispatchFinishTemporaryDetach();
return transientView;
}
@@ -2367,7 +2369,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
} else {
isScrap[0] = true;
child.dispatchFinishTemporaryDetach();
// Finish the temporary detach started in addScrapView().
transientView.dispatchFinishTemporaryDetach();
}
}