| commit | 80a28fe8d69cbf629a6f8cca23de9fc6e7673326 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Nov 05 16:37:13 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 05 16:37:13 2014 +0000 |
| tree | 5bb2b92a894a8cc7a385566534887aa1ef7cbcac | |
| parent | 3bc103b8dbcacf908e6512b805c89a399a460be9 [diff] | |
| parent | 09ba32c0ba9306bafa25e27a2fa7d6e53e9be715 [diff] |
Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev automerge: 09ba32c * commit '09ba32c0ba9306bafa25e27a2fa7d6e53e9be715': Fix janky in transition doze -> lockscreen
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewImageButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewImageButton.java index d55b0b3..35fd688 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewImageButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewImageButton.java
@@ -61,4 +61,9 @@ outRect.top += translationY; outRect.bottom += translationY; } + + @Override + public boolean hasOverlappingRendering() { + return false; + } }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 142791d..84ebcdfb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -3074,8 +3074,6 @@ } else if (Intent.ACTION_SCREEN_ON.equals(action)) { mScreenOn = true; - // work around problem where mDisplay.getRotation() is not stable while screen is off (bug 7086018) - repositionNavigationBar(); notifyNavigationBarScreenOn(true); } else if (ACTION_DEMO.equals(action)) {