Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add target sdk check for behavior change." into oc-dev

Browse Source 
am: e5e246ce5c

Change-Id: Ia06fe694f2afe55cd9560c2d6ae9112a6735cf93
This commit is contained in:
George Mount
2017-06-09 23:51:06 +00:00
committed by android-build-merger
parent 2bdff7d64e e5e246ce5c
commit 4e76728dea
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/FragmentManager.java
View File

@@ -1353,9 +1353,11 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
f.performDestroyView(); f.performDestroyView();
dispatchOnFragmentViewDestroyed(f, false); dispatchOnFragmentViewDestroyed(f, false);
if (f.mView != null && f.mContainer != null) { if (f.mView != null && f.mContainer != null) {
if (getTargetSdk() >= Build.VERSION_CODES.O) {
// Stop any current animations: // Stop any current animations:
f.mView.clearAnimation(); f.mView.clearAnimation();
f.mContainer.endViewTransition(f.mView); f.mContainer.endViewTransition(f.mView);
}
Animator anim = null; Animator anim = null;
if (mCurState > Fragment.INITIALIZING && !mDestroyed if (mCurState > Fragment.INITIALIZING && !mDestroyed
&& f.mView.getVisibility() == View.VISIBLE && f.mView.getVisibility() == View.VISIBLE