summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-08-20 20:31:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-20 20:31:53 -0700
commit2f2a9fc50acb0e2be6450d1a5031e2019f6893fb (patch)
treef7efa296e600860e294c538fbab53acff418f367
parent273f22246679d85b56e0f0be79087089adbd48c0 (diff)
parent8eaba6002615f2f89979a50e848c34503fd1e105 (diff)
downloadframeworks_base-2f2a9fc50acb0e2be6450d1a5031e2019f6893fb.zip
frameworks_base-2f2a9fc50acb0e2be6450d1a5031e2019f6893fb.tar.gz
frameworks_base-2f2a9fc50acb0e2be6450d1a5031e2019f6893fb.tar.bz2
am 8eaba600: Merge "Disable electron beam on animation." into jb-mr1-dev
* commit '8eaba6002615f2f89979a50e848c34503fd1e105': Disable electron beam on animation.
-rw-r--r--services/java/com/android/server/power/DisplayPowerController.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/power/DisplayPowerController.java b/services/java/com/android/server/power/DisplayPowerController.java
index 9d04a0c..cf12b20 100644
--- a/services/java/com/android/server/power/DisplayPowerController.java
+++ b/services/java/com/android/server/power/DisplayPowerController.java
@@ -75,8 +75,8 @@ final class DisplayPowerController {
// If true, uses the electron beam on animation.
// We might want to turn this off if we cannot get a guarantee that the screen
// actually turns on and starts showing new content after the call to set the
- // screen state returns.
- private static final boolean USE_ELECTRON_BEAM_ON_ANIMATION = true;
+ // screen state returns. Playing the animation can also be somewhat slow.
+ private static final boolean USE_ELECTRON_BEAM_ON_ANIMATION = false;
private static final int ELECTRON_BEAM_ON_ANIMATION_DURATION_MILLIS = 300;
private static final int ELECTRON_BEAM_OFF_ANIMATION_DURATION_MILLIS = 600;