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

am 2b02564b: am fa5bc081: Merge "Increase window freeze timeout for bigger screens." into jb-mr1-dev

Browse Source 
* commit '2b02564bfd8db8a584e6c98d24416a16bcc5e20d':
  Increase window freeze timeout for bigger screens.
This commit is contained in:
Craig Mautner
2012-10-10 12:46:11 -07:00
committed by Android Git Automerger
parent 87efb143a1 2b02564bfd
commit c410e77ce8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -264,6 +264,9 @@ public class WindowManagerService extends IWindowManager.Stub
*/ */
static final int DEFAULT_FADE_IN_OUT_DURATION = 400; 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 * If true, the window manager will do its own custom freezing and general
* management of the screen during rotation. * management of the screen during rotation.
@@ -6018,7 +6021,8 @@ public class WindowManagerService extends IWindowManager.Stub
mWindowsFreezingScreen = true; mWindowsFreezingScreen = true;
mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT); 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; mWaitingForConfig = true;
getDefaultDisplayContentLocked().layoutNeeded = true; getDefaultDisplayContentLocked().layoutNeeded = true;
startFreezingDisplayLocked(inTransaction, 0, 0); startFreezingDisplayLocked(inTransaction, 0, 0);
@@ -8380,7 +8384,7 @@ public class WindowManagerService extends IWindowManager.Stub
// when we first froze the display. // when we first froze the display.
mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT); mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);
mH.sendMessageDelayed(mH.obtainMessage( mH.sendMessageDelayed(mH.obtainMessage(
H.WINDOW_FREEZE_TIMEOUT), 2000); H.WINDOW_FREEZE_TIMEOUT), WINDOW_FREEZE_TIMEOUT_DURATION);
} }
} }
} }