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

Merge "Fix showing views after failed transition to translucent window." into oc-mr1-dev

Browse Source 
am: 2f35f15ab0

Change-Id: Ie360f3af438f0c1b58620048258d7ba666363744
This commit is contained in:
George Mount
2017-09-11 17:40:46 +00:00
committed by android-build-merger
parent 8dd7d067f7 2f35f15ab0
commit 87f68c849f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/ActivityTransitionCoordinator.java
View File

@@ -1006,9 +1006,12 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
final int numElements = mTransitioningViews == null ? 0 : mTransitioningViews.size(); final int numElements = mTransitioningViews == null ? 0 : mTransitioningViews.size();
for (int i = 0; i < numElements; i++) { for (int i = 0; i < numElements; i++) {
final View view = mTransitioningViews.get(i); final View view = mTransitioningViews.get(i);
view.setTransitionVisibility(visiblity);
if (invalidate) { if (invalidate) {
view.invalidate(); // Allow the view to be invalidated by the visibility change
view.setVisibility(visiblity);
} else {
// Don't invalidate the view with the visibility change
view.setTransitionVisibility(visiblity);
} }
} }
} }