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

Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev automerge: 09ba32c

Browse Source 
automerge: 80a28fe

* commit '80a28fe8d69cbf629a6f8cca23de9fc6e7673326':
  Fix janky in transition doze -> lockscreen
This commit is contained in:
Jorim Jaggi
2014-11-05 18:06:27 +00:00
committed by android-build-merger
parent a4341f9cf3 80a28fe8d6
commit 80ae285010
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/DismissViewImageButton.java
View File

@@ -61,4 +61,9 @@ public class DismissViewImageButton extends ImageButton {
outRect.top += translationY; outRect.top += translationY;
outRect.bottom += translationY; outRect.bottom += translationY;
} }
@Override
public boolean hasOverlappingRendering() {
return false;
}
} }

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

@@ -3074,8 +3074,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} }
else if (Intent.ACTION_SCREEN_ON.equals(action)) { else if (Intent.ACTION_SCREEN_ON.equals(action)) {
mScreenOn = true; mScreenOn = true;
// work around problem where mDisplay.getRotation() is not stable while screen is off (bug 7086018)
repositionNavigationBar();
notifyNavigationBarScreenOn(true); notifyNavigationBarScreenOn(true);
} }
else if (ACTION_DEMO.equals(action)) { else if (ACTION_DEMO.equals(action)) {