Amith Yamasani
10b0dad0d8
am fbb417f8: am 6facef70: am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev
...
* commit 'fbb417f8744714792ff5cb242d78dcf88d47a28c':
Do cleanup when Stopping users
2012-10-16 21:48:54 -07:00
Amith Yamasani
fbb417f874
am 6facef70: am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev
...
* commit '6facef70b5d6588450c6ee59a676a0cf3bfc745e':
Do cleanup when Stopping users
2012-10-16 21:45:59 -07:00
Amith Yamasani
6facef70b5
am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev
...
* commit 'b6c171b1afa871aa092dd2ec2ed25f48275ef194':
Do cleanup when Stopping users
2012-10-16 21:43:20 -07:00
Amith Yamasani
b6c171b1af
Merge "Do cleanup when Stopping users" into jb-mr1-dev
2012-10-16 21:41:28 -07:00
Svetoslav Ganov
5ada6dbbb1
am 40577560: am 61fa73c5: am 05ad745f: Merge "Long press not working if explore by touch and magnification are on." into jb-mr1-dev
...
* commit '40577560c941dc53d19b4373aa8a1f5a908e7471':
Long press not working if explore by touch and magnification are on.
2012-10-16 19:59:26 -07:00
Svetoslav Ganov
40577560c9
am 61fa73c5: am 05ad745f: Merge "Long press not working if explore by touch and magnification are on." into jb-mr1-dev
...
* commit '61fa73c51e811f5d1cc3ad1d3645863d13befdc0':
Long press not working if explore by touch and magnification are on.
2012-10-16 19:55:58 -07:00
Svetoslav Ganov
61fa73c51e
am 05ad745f: Merge "Long press not working if explore by touch and magnification are on." into jb-mr1-dev
...
* commit '05ad745ff63ed3bcdb86d42290ddc2ee214fe90f':
Long press not working if explore by touch and magnification are on.
2012-10-16 19:53:38 -07:00
Svetoslav Ganov
05ad745ff6
Merge "Long press not working if explore by touch and magnification are on." into jb-mr1-dev
2012-10-16 19:50:22 -07:00
Craig Mautner
4a9c5a9550
am 9cf13e5b: am aa2804aa: am e13ae648: Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
...
* commit '9cf13e5bebc9adcdcd12ffb451dddda96867fa4c':
Use parent window to evaluate show-to-all-users.
2012-10-16 19:05:59 -07:00
Craig Mautner
9cf13e5beb
am aa2804aa: am e13ae648: Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
...
* commit 'aa2804aa2bf1a2c89af947501549361945ffac3f':
Use parent window to evaluate show-to-all-users.
2012-10-16 19:04:04 -07:00
Craig Mautner
aa2804aa2b
am e13ae648: Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
...
* commit 'e13ae648504661ca158d15aa415568e351b380c4':
Use parent window to evaluate show-to-all-users.
2012-10-16 19:01:35 -07:00
Craig Mautner
e13ae64850
Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
2012-10-16 18:58:58 -07:00
Svetoslav Ganov
72e3512960
Long press not working if explore by touch and magnification are on.
...
1. In the magnifier we are caching the touch events until we figure
out whether the user is triple tapping to enable magnification.
If the user is not trying to engage magnification we deliver the
stashed events. However, these events are stale and the subsequent
transformations such as the touch explorer get confused when trying
to detect a tap since the delay is longer than the tap slop.
This change compensates for the time the events were cached
before sending them to the next transformation in the chain.
bug:7362365
Change-Id: Idd8539ffed7ba4892c5a916bd34910fd2ef50f75
2012-10-16 18:26:57 -07:00
Laurent Tu
37882dbecc
am 9bebd2a4: am 130ba7da: am de5c3a04: Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
...
* commit '9bebd2a438f0ee0c53b41c83746637a8fd28223b':
Handle unknown case in LocationManager.getProvider
2012-10-16 17:36:02 -07:00
Laurent Tu
9bebd2a438
am 130ba7da: am de5c3a04: Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
...
* commit '130ba7dae85afc46e0066114a33acba5eee7530c':
Handle unknown case in LocationManager.getProvider
2012-10-16 17:33:16 -07:00
Jeff Brown
d8fad129ee
am 63241c51: am 5d32cba6: am 645b05a6: Merge "Blank all displays including Wifi Display when screen is off." into jb-mr1-dev
...
* commit '63241c51b7374b31dec94c35df54c5164e3b74a0':
Blank all displays including Wifi Display when screen is off.
2012-10-16 17:31:54 -07:00
Laurent Tu
130ba7dae8
am de5c3a04: Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
...
* commit 'de5c3a04517bba3adacd8c6eb2b365cf93c73a69':
Handle unknown case in LocationManager.getProvider
2012-10-16 17:30:43 -07:00
Jeff Brown
63241c51b7
am 5d32cba6: am 645b05a6: Merge "Blank all displays including Wifi Display when screen is off." into jb-mr1-dev
...
* commit '5d32cba6e42c9b7b1ce61e5ea4f6a2940347efdd':
Blank all displays including Wifi Display when screen is off.
2012-10-16 17:27:45 -07:00
Laurent Tu
de5c3a0451
Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
2012-10-16 17:27:09 -07:00
Jeff Brown
5d32cba6e4
am 645b05a6: Merge "Blank all displays including Wifi Display when screen is off." into jb-mr1-dev
...
* commit '645b05a6e47ee7052b12a8b4e916d311f4e59e99':
Blank all displays including Wifi Display when screen is off.
2012-10-16 17:25:21 -07:00
Jeff Brown
645b05a6e4
Merge "Blank all displays including Wifi Display when screen is off." into jb-mr1-dev
2012-10-16 17:22:40 -07:00
Jeff Brown
8ec0943a79
Blank all displays including Wifi Display when screen is off.
...
Calling blank() on Surface Flinger to turn the screen off is not
enough to ensure that the content is blanked to all virtual displays.
What's more, the black surface left in place by the ElectronBeam may
not completely hide the content (particularly if the display orientation
changes). To fix this for real, we'll want to move the display power
management code from the power manager into the display manager
but we don't have time for that.
As a work around, force all displays to show an empty layer stack
with no surfaces on it while blanked.
Bug: 7311959
Change-Id: I870c985f9e76f3f2322e5d83cdbbed9ed15b9f10
2012-10-16 16:19:23 -07:00
Craig Mautner
341220fd09
Use parent window to evaluate show-to-all-users.
...
When a window is attached to another window use the parent window's
attributes to determine whether the child window should be shown
to all users.
Bug: 7328633 fixed.
Change-Id: I9601c149af87f624378e6895063bb3179d4f845e
2012-10-16 15:20:09 -07:00
Svetoslav Ganov
88939e5c84
am c53fee3b: am 5ac909f9: am 964629ac: Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev
...
* commit 'c53fee3b435f8e84b4608ee4eac5c536210c5c20':
Occasionally triple tap on the keyboard toggles screen magnification.
2012-10-16 14:41:13 -07:00
Svetoslav Ganov
c53fee3b43
am 5ac909f9: am 964629ac: Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev
...
* commit '5ac909f9e2ab42842c0697c9af31bd95bfc3cb68':
Occasionally triple tap on the keyboard toggles screen magnification.
2012-10-16 14:25:59 -07:00
Laurent Tu
b7f9d25497
Handle unknown case in LocationManager.getProvider
...
If a provider is unknown, return null in
LocationManagerService.getProviderProperties() instead of throwing a
security exception, so that LocationManager.getProvider() returns null
in this case, as specified by the javadoc.
Bug: 7359960
Change-Id: I1b8b74745f66717a3439a1d353a46a23272cc313
2012-10-16 14:25:00 -07:00
Svetoslav Ganov
5ac909f9e2
am 964629ac: Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev
...
* commit '964629aca8d076826198a21b654ed858618b5619':
Occasionally triple tap on the keyboard toggles screen magnification.
2012-10-16 14:22:59 -07:00
Svetoslav Ganov
964629aca8
Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev
2012-10-16 14:20:45 -07:00
Craig Mautner
c934ce8613
am b15238dc: am 413c4ba7: am dc9e13b3: Merge "Perform all layouts within first loop." into jb-mr1-dev
...
* commit 'b15238dc75819b8230d441828991adbcf3ac7e7f':
Perform all layouts within first loop.
2012-10-16 13:55:13 -07:00
Craig Mautner
b15238dc75
am 413c4ba7: am dc9e13b3: Merge "Perform all layouts within first loop." into jb-mr1-dev
...
* commit '413c4ba7d46aaaa59de06a75493096d9ce5a6e1b':
Perform all layouts within first loop.
2012-10-16 13:52:33 -07:00
Craig Mautner
413c4ba7d4
am dc9e13b3: Merge "Perform all layouts within first loop." into jb-mr1-dev
...
* commit 'dc9e13b30ab26f8382b7e67dd681dee9b04bdb29':
Perform all layouts within first loop.
2012-10-16 13:49:52 -07:00
Craig Mautner
feb5273117
am 8bb6b77d: am 6dbfc0e9: am 417b0591: Merge "Revert app freeze timeout delay." into jb-mr1-dev
...
* commit '8bb6b77d797a28a851e401b4aa27f249b6d22299':
Revert app freeze timeout delay.
2012-10-16 13:48:46 -07:00
Craig Mautner
dc9e13b30a
Merge "Perform all layouts within first loop." into jb-mr1-dev
2012-10-16 13:46:46 -07:00
Craig Mautner
8bb6b77d79
am 6dbfc0e9: am 417b0591: Merge "Revert app freeze timeout delay." into jb-mr1-dev
...
* commit '6dbfc0e908f0f07f81327510733f64137202c1d1':
Revert app freeze timeout delay.
2012-10-16 13:46:09 -07:00
Craig Mautner
6dbfc0e908
am 417b0591: Merge "Revert app freeze timeout delay." into jb-mr1-dev
...
* commit '417b05912a2eb960d59541d546d1e857f95d906b':
Revert app freeze timeout delay.
2012-10-16 13:43:44 -07:00
Craig Mautner
417b05912a
Merge "Revert app freeze timeout delay." into jb-mr1-dev
2012-10-16 13:39:47 -07:00
Craig Mautner
a13a41dc0e
Perform all layouts within first loop.
...
Do not begin animation while layout requests are still
outstanding.
Bug: 7333622 fixed.
Change-Id: I77c2cdc123c1e26f9661feade0d9a1843c75d5f6
2012-10-16 12:54:48 -07:00
Svetoslav Ganov
55468c64bc
Occasionally triple tap on the keyboard toggles screen magnification.
...
1. Sometimes unlocking the device when the IME is up and triple tapping on the keyboard
toggles screen magnification. The core reason is that when the kayguard window is
shown we hide all other windows and when it is hidden we show these windows. We did
not notify the screen magnifier for windows being shown and hidden. Also when the
windows are shown we may reassign layers to put the IME or the wallpaper in the
right Z order. The screen magnifier is now notified upon such layer reassignment
since window layers are used when computing the magnified region.
bug:7351531
Change-Id: I0931f4ba6cfa565d8eb1e3c432268ba1818feea6
2012-10-16 11:11:39 -07:00
Craig Mautner
a4942c9fb9
Revert app freeze timeout delay.
...
Speed up of wallpaper loading on Manta means this workaround is no
longer necessary.
Bug 7354440 fixed.
Change-Id: Ic0ad3c689abb5342fb29c824857db9d5c2d45008
2012-10-16 09:06:53 -07:00
Daniel Sandler
171786f439
am d0dee222: am 36074eec: am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev
...
* commit 'd0dee22255eb45e6e3640fdf05d2cc2393045dca':
Allow any user to clear a notification targeted at USER_ALL.
2012-10-15 22:30:47 -07:00
Daniel Sandler
d0dee22255
am 36074eec: am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev
...
* commit '36074eecccaaa52e535513829b9de13ac3930347':
Allow any user to clear a notification targeted at USER_ALL.
2012-10-15 22:28:24 -07:00
Daniel Sandler
36074eeccc
am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev
...
* commit '1f0752993ffd4339cdf0e7d69b96093503bd2e24':
Allow any user to clear a notification targeted at USER_ALL.
2012-10-15 22:25:20 -07:00
Daniel Sandler
1f0752993f
Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev
2012-10-15 22:23:29 -07:00
Craig Mautner
858f0cce06
am 6404f11b: am 9018c0a9: am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev
...
* commit '6404f11bd6da186e571e6070447a3934fb2743d4':
Always layout Keyguard on config change.
2012-10-15 22:13:37 -07:00
Craig Mautner
6404f11bd6
am 9018c0a9: am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev
...
* commit '9018c0a96fa9d3e422fdef630be481d8ba96298a':
Always layout Keyguard on config change.
2012-10-15 22:11:12 -07:00
Craig Mautner
9018c0a96f
am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev
...
* commit 'f6dbd61b108e586c1db3e61cbfc07d4d750027c0':
Always layout Keyguard on config change.
2012-10-15 22:09:05 -07:00
Craig Mautner
f6dbd61b10
Merge "Always layout Keyguard on config change." into jb-mr1-dev
2012-10-15 22:05:55 -07:00
Jamie Gennis
0d4f45d942
am b312f115: am 38041d6b: am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev
...
* commit 'b312f1155caa1b323f482b92564cd07f3151c66b':
Flag window animation transactions as animations.
2012-10-15 20:23:09 -07:00
Jeff Brown
4ffdf84bca
am 19e2d23c: am d56d6702: am 0e082155: Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev
...
* commit '19e2d23cf4d547a9f09d0086dc88435c9a19e91c':
Stop dreaming if the battery not charging effectively.
2012-10-15 20:22:52 -07:00
Jeff Brown
31f36344bc
am 09b37314: am 6593105c: am 322de606: Merge "Cleanup some internal documentation." into jb-mr1-dev
...
* commit '09b37314b6a95e4ecff867c74e85e196fcf08557':
Cleanup some internal documentation.
2012-10-15 20:22:44 -07:00