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

Merge "Fix divider animation" into nyc-dev

Browse Source 
am: 4deec30

* commit '4deec3080f5d5b1fe3105261a944a09c73649c71':
  Fix divider animation
This commit is contained in:
Jorim Jaggi
2016-03-28 21:05:45 +00:00
committed by android-build-merger
parent 00217cddcd 4deec3080f
commit 90be08186f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -2777,11 +2777,19 @@ public class PhoneWindowManager implements WindowManagerPolicy {
int insets = mWindowManagerFuncs.getDockedDividerInsetsLw();
// If the divider is behind the navigation bar, don't animate.
if (mNavigationBar != null
final Rect frame = win.getFrameLw();
final boolean behindNavBar = mNavigationBar != null
&& ((mNavigationBarOnBottom
&& win.getFrameLw().top + insets >= mNavigationBar.getFrameLw().top)
&& frame.top + insets >= mNavigationBar.getFrameLw().top)
|| (!mNavigationBarOnBottom
&& win.getFrameLw().left + insets >= mNavigationBar.getFrameLw().left))) {
&& frame.left + insets >= mNavigationBar.getFrameLw().left));
final boolean landscape = frame.height() > frame.width();
final boolean offscreenLandscape = landscape && (frame.right - insets <= 0
|| frame.left + insets >= win.getDisplayFrameLw().right);
final boolean offscreenPortrait = !landscape && (frame.top - insets <= 0
|| frame.bottom + insets >= win.getDisplayFrameLw().bottom);
final boolean offscreen = offscreenLandscape || offscreenPortrait;
if (behindNavBar || offscreen) {
return 0;
}
if (transit == TRANSIT_ENTER || transit == TRANSIT_SHOW) {