John Spurlock
01d2c64ab2
am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
...
* commit '7404f28b11e386a42b67ec8afcc9823f2bd03c2b':
Frameworks base: Promote dream setting defaults to config.
2012-10-19 11:05:23 -07:00
John Spurlock
7404f28b11
am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
...
* commit '8c82025650fdbcb2a80be03f8be6dbff430b678c':
Frameworks base: Promote dream setting defaults to config.
2012-10-19 11:02:40 -07:00
John Spurlock
8c82025650
Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
2012-10-19 11:00:00 -07:00
Craig Mautner
59a9cc18f3
am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
...
* commit '444354d2c62de37b65782f15c864af21086b4b04':
Allow getDisplayContentLocked to return null...
2012-10-19 09:32:19 -07:00
Craig Mautner
444354d2c6
am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
...
* commit '0ed07a0a30ef71053d0426956d3c198bb7540d4e':
Allow getDisplayContentLocked to return null...
2012-10-19 09:30:06 -07:00
Craig Mautner
0ed07a0a30
Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
2012-10-19 09:27:06 -07:00
Michael Jurka
20124e4d5e
am 9019335c: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
...
* commit '9019335cd2daa896781f8d1ac67301f0f1b70ad9':
Fixing wallpaper flash when going in/out of Recents
2012-10-19 09:11:26 -07:00
Michael Jurka
9019335cd2
am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
...
* commit 'e9687ba8bdccc27f98fe1dcdc48faac0c0de4c18':
Fixing wallpaper flash when going in/out of Recents
2012-10-19 09:09:06 -07:00
John Spurlock
ed108f3d12
Frameworks base: Promote dream setting defaults to config.
...
So that:
- the values can be shared (to fix assoc bug)
- the values can be customized in product overlays
Bug:7373284
Change-Id: I37f037082523a3d975f6014f36afa28c60117372
2012-10-19 11:32:03 -04:00
Michael Jurka
738cfc9105
Fixing wallpaper flash when going in/out of Recents
...
Bug: 7372516
Bug: 7216872
Change-Id: I2a2308a85caf9f2ad2d382c709e5f8867bd060be
2012-10-19 16:58:50 +02:00
Jeff Brown
d2b36bc540
am fee1a210: am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
...
* commit 'fee1a2109e846e4bb628a56ddc5b907df356e452':
Reduce auto-brightness jitter.
2012-10-18 23:28:29 -07:00
Jeff Sharkey
f1ad6d5b79
am 93b17876: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev
...
* commit '93b17876d44f27141335295ee9ffd88bb9f23817':
More migration to Global settings.
2012-10-18 23:28:26 -07:00
Jeff Brown
0fab9247c9
am fba021ea: am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
...
* commit 'fba021eaacfb2b44fc36f9fb74bac08b32a841e5':
Fix deadlock.
2012-10-18 23:28:22 -07:00
Jeff Brown
fee1a2109e
am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
...
* commit '1d2b445d7431420b7cfbd9ef3fe4e326e121eeae':
Reduce auto-brightness jitter.
2012-10-18 23:26:23 -07:00
Jeff Sharkey
93b17876d4
am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev
...
* commit '5831159b8d4cf85fa46e2c4cb8e7d9f750014d6f':
More migration to Global settings.
2012-10-18 23:26:15 -07:00
Jeff Brown
fba021eaac
am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
...
* commit 'ce78b026179bc041bce9c9e2d8b63b79a97cbf67':
Fix deadlock.
2012-10-18 23:26:11 -07:00
Jeff Brown
1d2b445d74
Merge "Reduce auto-brightness jitter." into jb-mr1-dev
2012-10-18 23:23:57 -07:00
Jeff Sharkey
5831159b8d
Merge "More migration to Global settings." into jb-mr1-dev
2012-10-18 23:23:16 -07:00
Jeff Brown
ce78b02617
Merge "Fix deadlock." into jb-mr1-dev
2012-10-18 23:22:02 -07:00
Jeff Brown
4f0e969eab
Reduce auto-brightness jitter.
...
Apply additional hysteresis controls to prevent repeated brightness
changes within a short interval.
Bug: 7266090
Change-Id: I73122457f6f3200c80188d3716ce2baf38f6a0a6
2012-10-18 18:45:55 -07:00
Jeff Brown
6669250034
Fix deadlock.
...
The display manager must never call into the activity manager with
its lock held. Make it clear that the adapters are constructed
while holding the syncroot lock.
Bug: 7377631
Change-Id: I1557313cbb31dcad9b5a46919a88a5a1c1af3e9b
2012-10-18 17:37:39 -07:00
Jeff Sharkey
8d9a1f66d9
More migration to Global settings.
...
Bug: 7375796
Change-Id: I3954ce141ad30073896090a28eee743ba15fd736
2012-10-18 15:38:14 -07:00
Svetoslav Ganov
83c57b5c52
am d7169b59: am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
...
* commit 'd7169b5936721e8e985e6bf7f7e47095b8d6dcfa':
Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
2012-10-18 15:05:26 -07:00
Svetoslav Ganov
d7169b5936
am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
...
* commit '80ce3d8746e9bb727ebf37a8963b96be84d82413':
Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
2012-10-18 15:02:25 -07:00
Svetoslav Ganov
80ce3d8746
Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
2012-10-18 15:00:18 -07:00
Craig Mautner
9b56af302e
am 84288ac1: am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
...
* commit '84288ac10c96e674be6f0d662862d7c8dbd30de4':
When removing windows remove from resize list.
2012-10-18 14:52:16 -07:00
Craig Mautner
84288ac10c
am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
...
* commit 'be2a4a5e629b31071a160d57188219d6a76011fa':
When removing windows remove from resize list.
2012-10-18 14:49:31 -07:00
Craig Mautner
be2a4a5e62
Merge "When removing windows remove from resize list." into jb-mr1-dev
2012-10-18 14:46:13 -07:00
Craig Mautner
2d5618c221
Allow getDisplayContentLocked to return null...
...
... and check for null returns. This prevents DisplayContent objects
from containing null Display references.
Bug: 7368565 fixed.
Change-Id: I830fb4c1349204c366193657a95a92c48ccee66c
2012-10-18 14:16:43 -07:00
Jeff Hamilton
520afbd2dc
am ba2c79a5: am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
...
* commit 'ba2c79a59fa9640d3f54c81f05f664a47337a05c':
Changes to support updating location providers.
2012-10-18 12:50:34 -07:00
Jeff Hamilton
ba2c79a59f
am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
...
* commit 'e09aed49e3498c9e0f3545ab97f816233d5eac66':
Changes to support updating location providers.
2012-10-18 12:47:31 -07:00
Jeff Hamilton
e09aed49e3
Merge "Changes to support updating location providers." into jb-mr1-dev
2012-10-18 12:45:02 -07:00
Christopher Tate
d9466f940a
am 2f296598: am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
...
* commit '2f2965985236d5cdc9cf2125055971da8e070e6f':
Sanity-check erroneous backup agent instantiations
2012-10-18 12:21:28 -07:00
Christopher Tate
2f29659852
am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
...
* commit '1ea75b88b7ac4273b7a5395c5c57c6453d6cd3d1':
Sanity-check erroneous backup agent instantiations
2012-10-18 12:18:42 -07:00
Svetoslav Ganov
444e8aabc1
Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
...
1. When magnifier, if a dialog that popped up is wider than the scree we pan to its upper
left corner. We now show the upper right corner if the locale direction is RTL.
2. Keyguard dialogs are not centered since they are used as a sign to recompute the
magnified area but an unnecessary else statement prevents such dialogs from being
properly show via a pan.
bug:7374331
Change-Id: I285e46b822a29f0082c502cb642f9da32dabfe6a
2012-10-18 12:15:02 -07:00
Christopher Tate
1ea75b88b7
Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
2012-10-18 12:07:03 -07:00
Victoria Lease
fff8c1d8d8
am 733ad7a2: am 588fb15d: Merge "LocationManager permissions cleanup" into jb-mr1-dev
...
* commit '733ad7a2e162cbf13efedeed1e2697d74a6e4a4b':
LocationManager permissions cleanup
2012-10-18 11:08:09 -07:00
Victoria Lease
733ad7a2e1
am 588fb15d: Merge "LocationManager permissions cleanup" into jb-mr1-dev
...
* commit '588fb15d16118b848c2d76497861b0e86846486b':
LocationManager permissions cleanup
2012-10-18 11:05:54 -07:00
Victoria Lease
588fb15d16
Merge "LocationManager permissions cleanup" into jb-mr1-dev
2012-10-18 11:02:52 -07:00
Amith Yamasani
84156ea848
am 37d64712: am 0141faec: Merge "Allow services to query the info for a dying user." into jb-mr1-dev
...
* commit '37d6471207192d3904616b6b08b970574aa73235':
Allow services to query the info for a dying user.
2012-10-18 10:53:51 -07:00
Amith Yamasani
37d6471207
am 0141faec: Merge "Allow services to query the info for a dying user." into jb-mr1-dev
...
* commit '0141faecc3b4a1cb771f38495d42c56eb6852fa8':
Allow services to query the info for a dying user.
2012-10-18 10:51:36 -07:00
Amith Yamasani
0141faecc3
Merge "Allow services to query the info for a dying user." into jb-mr1-dev
2012-10-18 10:48:21 -07:00
Craig Mautner
860f660a0f
When removing windows remove from resize list.
...
Windows remained in the resized list if they were removed during
rotations.
Bug: 7372289 fixed.
Change-Id: I41f949b7836b08b33d4d178e9aa016548328749a
2012-10-18 09:38:10 -07:00
Victoria Lease
37425c3475
LocationManager permissions cleanup
...
This commit is the result of a comprehensive permissions review for
MR1 release. It addresses a number of deviations from spec and from
MR0's behavior, bringing MR1 into sync with both.
It also cleans up the concept of "location resolution permission",
representing it internally as an enumerated access level to reduce
reliance on cumbersome string manipulation. There's a function to
convert the enum int into a permission string where needed, too.
Additionally, this confines caller-identity-sensitive calls to the
hopefully-obviously-named "getCallerAllowedResolutionLevel()". This
should make it much easier to prove correctness with respect to
accidentally calling functions that depend upon the caller's identity
after identity has already been shed by Binder.clearCallingIdentity().
Change-Id: I446169aee8fb2fde26ac6d04b479b40253782acb
2012-10-18 09:13:39 -07:00
Jeff Brown
f3c6825207
am 1d9cebee: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
...
* commit '1d9cebee1451ad5845ea7f4e0f7ab7ff8bb48185':
Dream when user activity times out while docked if appropriate.
2012-10-18 00:14:56 -07:00
Jeff Brown
05d7709e77
am 5561baef: am 586503d5: Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev
...
* commit '5561baef8b111d0eeaf9c47e98f3a160d4cb8559':
Add special mirroring modes for demonstration purposes.
2012-10-18 00:14:52 -07:00
Jeff Brown
1d9cebee14
am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
...
* commit '88c66cbb00a572ac8280f0e0ea38079d48ec59f3':
Dream when user activity times out while docked if appropriate.
2012-10-18 00:11:27 -07:00
Jeff Brown
5561baef8b
am 586503d5: Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev
...
* commit '586503d51fbcc622af62b43b25579ce2f299d68b':
Add special mirroring modes for demonstration purposes.
2012-10-18 00:09:49 -07:00
Jeff Brown
88c66cbb00
Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
2012-10-18 00:08:18 -07:00
Jeff Brown
586503d51f
Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev
2012-10-18 00:06:48 -07:00