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

Merge "Fix issue when launching Camera" into oc-mr1-dev

Browse Source 
am: 5737af21cb

Change-Id: Iad1d59d9e2f256a394a459185f1226110e6f2e93
This commit is contained in:
Jorim Jaggi
2017-08-16 14:10:46 +00:00
committed by android-build-merger
parent d79f39689e 5737af21cb
commit b0c8653427
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/AppWindowAnimator.java
View File

@@ -148,7 +148,7 @@ public class AppWindowAnimator {
}
// Start out animation gone if window is gone, or visible if window is visible.
transformation.clear();
transformation.setAlpha(mAppToken.hasContentToDisplay() ? 1 : 0);
transformation.setAlpha(mAppToken.isVisible() ? 1 : 0);
hasTransformation = true;
mStackClip = stackClip;
@@ -172,7 +172,7 @@ public class AppWindowAnimator {
animation = sDummyAnimation;
hasTransformation = true;
transformation.clear();
transformation.setAlpha(mAppToken.hasContentToDisplay() ? 1 : 0);
transformation.setAlpha(mAppToken.isVisible() ? 1 : 0);
}
void setNullAnimation() {

2
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -1479,7 +1479,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
// TODO: Another visibility method that was added late in the release to minimize risk.
@Override
public boolean canAffectSystemUiFlags() {
final boolean shown = mWinAnimator.getShown();
final boolean shown = mWinAnimator.getShown() && mWinAnimator.mShownAlpha > 0f;
// We only consider the app to be exiting when the animation has started. After the app
// transition is executed the windows are marked exiting before the new windows have been