commit 09ba32c0ba9306bafa25e27a2fa7d6e53e9be715
author Jorim Jaggi <jjaggi@google.com> Wed Nov 05 16:17:30 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 05 16:17:33 2014 +0000
tree af72935e0e9e31f6d79da8a98a0ff0d567c789c9
parent 36531b33b8e5bb249010f2414ed41d244c571464
parent 3e9d9b5953113787336ff42c842b49e6e591b26e

Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev

packages/SystemUI/src/com/android/systemui/statusbar/DismissViewImageButton.java

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;
+    }
 }

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

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)) {