summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/wm
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add null check to StackBox containment test.Craig Mautner2013-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relies on mFirst and mSecond being non-null exactly when mStack is null. Fixes bug 9774735. Change-Id: Ib0b463560b4bf69fdf05afe61ebe94ea0034a3ad
* | | | am 09a68ac9: am dbc51de4: am 53771e5f: Merge "Remove useless/repetitive code"Chet Haase2013-07-221-6/+4
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '09a68ac943e0d21ad61a94ed4eac1d6099657602': Remove useless/repetitive code
| * | am dbc51de4: am 53771e5f: Merge "Remove useless/repetitive code"Chet Haase2013-07-221-6/+4
| |\ \ | | |/ | | | | | | | | | * commit 'dbc51de44fe4f9a7f81528204250de32ec405d39': Remove useless/repetitive code
| | * am 53771e5f: Merge "Remove useless/repetitive code"Chet Haase2013-07-221-6/+4
| | |\ | | | | | | | | | | | | | | | | * commit '53771e5f955f67035cf6b6432c34171a18ab14dc': Remove useless/repetitive code
| | | * Remove useless/repetitive codeCyril Mottier2013-07-151-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixScale(float) method has been extracted from the code but the original code has been kept in place. Because of this, the animation scale is "fixed" twice which is not necessary. This patch, simply call fixScale(float) once and stores the result of it in the scale variable. Change-Id: I50aeacbc2c13ebbf447506ae4309d50c0e313837
| * | | am a64325f6: am 7c6be10d: Remove iterators (DO NOT MERGE)Craig Mautner2013-07-193-249/+205
| |\ \ \ | | |/ / | |/| | | | | | | | | | * commit 'a64325f6e70569255ff395a85ec161f3230f9e35': Remove iterators (DO NOT MERGE)
| | * | Remove iterators (DO NOT MERGE)Craig Mautner2013-07-163-249/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove DisplayContentsIterator and AllWindowsIterator. These were cute but they take up valuable resources. Iterate over ArrayList members in their place. Change-Id: Ie0c537608532cfb36f34d976cc6eacd21bad98cd
* | | | Merge "Fix home activity and user switch interactions."Craig Mautner2013-07-195-82/+51
|\ \ \ \
| * | | | Fix home activity and user switch interactions.Craig Mautner2013-07-195-82/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure Home activity goes in the correct task and on the correct stack. - Do not allow different users to be in the same task. - Do not set stacks aside for each user. Fixes bug 9775492. Change-Id: I0e7954e917aac8482a1015a36923e02914e2b692
* | | | | Access sparse array in correct mannerCraig Mautner2013-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was using get() for iteration. Consequence of cl 331550. Fixes bug 9902476. Change-Id: I4ec08d0421411981db8b8fba7342e9a3db606ce1
* | | | | Add properties to override size and densityColin Cross2013-07-181-2/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add properties ro.config.density_override and ro.config.size_override to provide build-time virtual screen sizes. A device with no override set with "wm size" will use the size specified by the property. "wm size reset" will go back to the physical size. Change-Id: I07a585eb2e0f91365fac2b64c53de3af138a2a85
* | | | Merge "Fix View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION."John Spurlock2013-07-172-3/+11
|\ \ \ \
| * | | | Fix View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION.John Spurlock2013-07-162-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a window's task stack has no sibling, restore old behavior of allowing frame to go below the nav bar. Bug:9884905 Change-Id: Ifc38901a6633cf431dba8740a65258d0618c0fd0
* | | | | Merge "Remove iterators."Craig Mautner2013-07-163-284/+223
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove iterators.Craig Mautner2013-07-163-284/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove DisplayContentsIterator and AllWindowsIterator. These were cute but they take up valuable resources. Iterate over ArrayList members in their place. Change-Id: I1d8a3b040175cb88b98f6a7e97cab06d17d5706b
* | | | | Merge "add TYPE_PRIVATE_PRESENTATION window type"keunyoung2013-07-122-0/+9
|\ \ \ \ \
| * | | | | add TYPE_PRIVATE_PRESENTATION window typekeunyoung2013-07-122-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This window type can be used for Presentation created on top of virtual private display. - There can be PRIVATE_PRESENTATION specific policy / behavior, but for now, there is nothing special. Change-Id: I9fde0f0376e57fcc60000d3a3f8657a21ef58993
* | | | | | am 8361a9f7: am 1a1a7c08: am 06a441de: Merge "Pass along the user id to ↵Amith Yamasani2013-07-122-3/+10
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | AttributeCache requests" into jb-mr2-dev * commit '8361a9f719b6a416a40134951daf28297b6e0670': Pass along the user id to AttributeCache requests
| * | | | am 1a1a7c08: am 06a441de: Merge "Pass along the user id to AttributeCache ↵Amith Yamasani2013-07-122-3/+10
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | requests" into jb-mr2-dev * commit '1a1a7c0878320b94d01da6bdfaa857c85b4199a3': Pass along the user id to AttributeCache requests
| | * | | Pass along the user id to AttributeCache requestsAmith Yamasani2013-07-102-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9759331 Change-Id: Ib96ba6a89c58edc207021aa43a2b67b4f6c50117
* | | | | Add convertToTranslucent to API.Craig Mautner2013-07-091-2/+13
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename convertToOpaque to convertFromTranslucent. Add the counterpart to Activity.convertFromTranslucent() for returning from opaque to a translucent Activity. The caller should wait until TranslucentConversionListener.onTranslucentConversionComplete() is called before actually changing the background to translucent. Change-Id: Id04b026bcc4dd8bad9a33a7af126e1bb28fb9c03
* | | | am a998fa2d: am e14afe71: am 58f26e9d: Merge "The order of child windows is ↵Jean-Baptiste Queru2013-07-081-1/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | switched" * commit 'a998fa2df957ad3f1c860d5ab8903041cf53a2f0': The order of child windows is switched
| * | | am 58f26e9d: Merge "The order of child windows is switched"Jean-Baptiste Queru2013-07-081-1/+26
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '58f26e9dfbd3986037fa5e52e8def1cb6b741bc3': The order of child windows is switched
| | * | The order of child windows is switchedtakeda.masayuki2013-07-081-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By calling WindowManagerService#reAddWindowLocked(), the window object in DisplayContent.mWindows is rearranged. If this window has children, the window objects belonging to WindowState.mChildWindows are also rearranged together. At this time, while DisplayContent.mWindows is arranged in ascending order of Z-Order, WindowState.mChildWindows is arranged in descending order. Therefore, if children (= WindowState.mChildWindows) are added to DisplayContent.mWindows in the original order, the order of children is switched. I think that children must be sorted before they are added. Change-Id: I28a506f17fcd99c801a3faa17cca66fffb291596
| | * | Fix potential deadlock between LockScreen and WindowManagerServiceSangkyu Lee2013-04-021-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If LockScreen is enhanced using SurfaceView/GLSurfaceView, deadlock problem between LockScreen and WindowManagerService can occur because of IWindow.resized() callback. And it must lead to watchdog and reset. IWindow.resized() callback is one-way function so calling resized() callback of a remote IWindow object is never blocked. However, calling resized() callback of a local IWindow object (LockScreen is running on the same system_server process) is always blocked until resized() callback returns. Because resized() callback of SurfaceView/GLSurfaceView can lead to WindowManagerService.relayoutWindow() call, deadlock can occur between relayoutWindow() and performLayoutAndPlaceSurfacesLockedInner(). (Both functions need locking mWindowMap) So this patch simulate one-way call when calling resized() callback of a local IWindow object. Change-Id: I2a6a5c74ed22d8e6b7a3bea3424ff2879d227105 Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
| * | | am cb359697: Merge "DO NOT MERGE. Fix issue #8868003: Recents thumbnails ↵Dianne Hackborn2013-05-091-4/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | scale..." into jb-mr2-dev * commit 'cb35969708e88057bda7c54c7b3ac1d606ad95c5': DO NOT MERGE. Fix issue #8868003: Recents thumbnails scale...
| | * | DO NOT MERGE. Fix issue #8868003: Recents thumbnails scale...Dianne Hackborn2013-05-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...+ zoom to wrong place We need to make sure the overscan insets are never negative. Change-Id: I6ca82acc2a6c887085a5d14d03a55ea78451e4b6
* | | | Merge "Add API to convert translucent Activity to opaque."Craig Mautner2013-06-271-1/+7
|\ \ \ \
| * | | | Add API to convert translucent Activity to opaque.Craig Mautner2013-06-251-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 9298778. Change-Id: If6198f42bdea8aa727a2abc672eb0062aaf63ca3
* | | | | Use FastPrintWriter... everywhere.Dianne Hackborn2013-06-241-3/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One problem this turned up is, because FastPrintWriter does its own buffering, a lot of code that used to use PrintWriter would fail -- if it pointed to a StringWriter, there was no buffering, so it could just immediately get the result. Now you need to first flush the FastPrintWriter. Also added some new constructors to specify the size of buffer that FastPrintWriter should use. Change-Id: If48cd28d7be0b6b3278bbb69a8357e6ce88cf54a
* | | | Merge "Fix unnecessary and harmful task movement."Craig Mautner2013-06-242-1/+10
|\ \ \ \
| * | | | Fix unnecessary and harmful task movement.Craig Mautner2013-06-242-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the focus to a new activity should not move it to the top of the task stack. When the previous activity fully pauses and the new focused activity resumes then it will be brought to the top of the task stack at the proper time. Moving it there prematurely causes the ActivityManager and WindowManager stack sequences to be out of sync. Fixes bug 9518153. Also remove false warnings in validateTopActivitiesLocked() and add debug for task movement to TaskStack. Change-Id: Ib57500b07ded97223155cda7ef603aecc9b642c3
* | | | | Add activity token to display system.Craig Mautner2013-06-221-2/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | First step in adding activity specific information to displays. Replace CompatibilityInfoHolder with DisplayAdjustmentsHolder that holds an activity token in addition to the CompatibilityInfo. Change-Id: Ie113cd8dd9c62e0b5311204e039a4829096bea68
* | | | Merge "Fix stack transfer bug."Craig Mautner2013-06-181-2/+2
|\ \ \ \
| * | | | Fix stack transfer bug.Craig Mautner2013-06-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the focused stack to the task with the started activity. Do not refocus when activities report resume. Add more conditional debug. Fixes bug 9481679. Change-Id: Ib7134e88f9a2c8ad1703af0d43442c8bbe4e65dc
* | | | | Add an API to allow for creating private virtual displays.Jeff Brown2013-06-182-4/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables applications to create a private virtual display that renders its content to a surface of its own creation. The display is private in the sense that only the application that owns the display is allowed to place windows upon it. Mirroring and blanking is also disabled for these displays. Bug: 9192512 Change-Id: I852ea07f0c7df1d244e354e3daca3a6960285ca0
* | | | Don't bring stack forward when moving tasks.Craig Mautner2013-06-171-3/+0
| | | | | | | | | | | | | | | | Change-Id: I222eda9e3ea62119c8948a99a63de55b13ca69f4
* | | | Remove concept of system bar from window manager.John Spurlock2013-06-141-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | It was already hardcoded to false, this change removes the dead code. Change-Id: I5e543344e60f69cb9882a70ba29f7c09404ad9fc
* | | | Centralize all system InputEventReceiver monitors.Craig Mautner2013-06-125-124/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement all system level InputEvent monitors as new InputEventListeners. Only one InputChannel required and monitoring can be enabled or disabled by registering with WindowManagerService. Change-Id: I64714ab858342ed183c62b421098478ffb6637bc
* | | | Merge "Finish InputEvents."Craig Mautner2013-06-071-39/+43
|\ \ \ \
| * | | | Finish InputEvents.Craig Mautner2013-06-071-39/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StackTapDetector was leaking InputEvents. Fixes bug 9180347. Change-Id: Ib526768024b54021ca02e6183bae847e217bb68d
* | | | | Make WindowState mUnderStatusBar reflect position.Craig Mautner2013-06-063-10/+19
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | The mUnderStatusBar variable was always true but now it changes when the StackBox is no longer directly under the Status Bar. Change-Id: I0c9db5790bfa9b0e4bb35e389d539fd941d56730
* | | | Merge "Extend stacks up under status bar"Craig Mautner2013-06-062-8/+15
|\ \ \ \
| * | | | Extend stacks up under status barCraig Mautner2013-06-052-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retain compatibility with earlier behavior. Fixes bug 8685941. Change-Id: Ida800a2476ba3a18cd97deccbc65c8a02739d118
* | | | | Fix a bug resolving the correct icon/logo in action barsAdam Powell2013-05-312-4/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some abstraction-breaking magic in ActionBarView and replace it with proper resolution of the icon/logo when creating a window. The old implementation relied on the ActionBarView's context being an Activity. Bug 9171554 Change-Id: Idbbb1942622195dcb55e8119f2d64287b07bb509
* | | | Merge "New ArrayMap class."Dianne Hackborn2013-05-242-3/+3
|\ \ \ \
| * | | | New ArrayMap class.Dianne Hackborn2013-05-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new kind of key/value mapping that stores its data as an array, so it doesn't need to create an extra Entry object for every mapping placed in to it. It is also optimized to reduce memory overhead in other ways, by keeping the base object small, being fairly aggressive about keeping the array data structures small, etc. There are some unit and performance tests dropped in to some random places; they will need to be put somewhere else once I decided what we are going to do with this for the next release (for example if we make it public the unit tests should go in to CTS). Switch IntentResolver to using ArrayMap instead of HashMap. Also get rid of a bunch of duplicate implementations of binarySearch, and add an optimization to the various sparse arrays where you can supply an explicit 0 capacity to prevent it from doing an initial array allocation; use this new optimization in a few places where it makes sense. Change-Id: I01ef2764680f8ae49938e2a2ed40dc01606a056b
* | | | | Convert API refs to StackBox from ActivityStack.Craig Mautner2013-05-243-67/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed IActivityManager.getStacks() since getStackBoxes() is better. - Made createStacks operate relative to StackBox instead of TaskStack. - Made resizeStack into resizeStackBox. Change-Id: I7a0e1f4e34f399b4fd1180c60cc3989f9c2433f3
* | | | | Add retrieval of StackBox info for more flexibilityCraig Mautner2013-05-243-0/+43
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | First step in permitting StackBoxes to be manipulated by user. Necessary for Configuration changes coming down. Change-Id: I4029926a35e4fdc59a5759fd9e4bae10bb308413
* | | | Merge "A tiny cleanup as the supplement of I9b5ef954479150bc4735 Bug: ↵Satoshi Kataoka2013-05-201-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | 3483284 Bug: 8851603"