diff options
| author | Craig Mautner <cmautner@google.com> | 2012-10-10 12:42:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 12:42:18 -0700 |
| commit | fa5bc081593891959c143e0de9e59dd076a47b42 (patch) | |
| tree | ac87cdf307f7e09774eea501d743103778de3279 /services/java/com/android/server | |
| parent | ccf9ef605e1195d3748459cc3d4dc3baa953252e (diff) | |
| parent | 7dfcb018206abebc45e478ef01465a50532f0f4e (diff) | |
| download | frameworks_base-fa5bc081593891959c143e0de9e59dd076a47b42.zip frameworks_base-fa5bc081593891959c143e0de9e59dd076a47b42.tar.gz frameworks_base-fa5bc081593891959c143e0de9e59dd076a47b42.tar.bz2 | |
Merge "Increase window freeze timeout for bigger screens." into jb-mr1-dev
Diffstat (limited to 'services/java/com/android/server')
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 037bfde..abbeb82 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -264,6 +264,9 @@ public class WindowManagerService extends IWindowManager.Stub */ static final int DEFAULT_FADE_IN_OUT_DURATION = 400; + /** Amount of time (in milliseconds) to delay before declaring a window freeze timeout. */ + static final int WINDOW_FREEZE_TIMEOUT_DURATION = 3000; + /** * If true, the window manager will do its own custom freezing and general * management of the screen during rotation. @@ -6018,7 +6021,8 @@ public class WindowManagerService extends IWindowManager.Stub mWindowsFreezingScreen = true; mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT); - mH.sendMessageDelayed(mH.obtainMessage(H.WINDOW_FREEZE_TIMEOUT), 2000); + mH.sendMessageDelayed(mH.obtainMessage(H.WINDOW_FREEZE_TIMEOUT), + WINDOW_FREEZE_TIMEOUT_DURATION); mWaitingForConfig = true; getDefaultDisplayContentLocked().layoutNeeded = true; startFreezingDisplayLocked(inTransaction, 0, 0); @@ -8380,7 +8384,7 @@ public class WindowManagerService extends IWindowManager.Stub // when we first froze the display. mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT); mH.sendMessageDelayed(mH.obtainMessage( - H.WINDOW_FREEZE_TIMEOUT), 2000); + H.WINDOW_FREEZE_TIMEOUT), WINDOW_FREEZE_TIMEOUT_DURATION); } } } |