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
Daniel Sandler
086725eb6a
am f4f0840f: am 6f25a33b: am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
...
* commit 'f4f0840f1d12d6f28236b876281c49e69e62b094':
Fix glitch when using settings pulldown then switching to notifications.
2012-10-18 10:33:11 -07:00
Daniel Sandler
f4f0840f1d
am 6f25a33b: am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
...
* commit '6f25a33b6ee8084c831f93a33a7a50c91f53c45e':
Fix glitch when using settings pulldown then switching to notifications.
2012-10-18 10:30:30 -07:00
Daniel Sandler
6f25a33b6e
am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
...
* commit '6a377f3094cf1e8e49e0138e01972e6d5d0ec2a0':
Fix glitch when using settings pulldown then switching to notifications.
2012-10-18 10:27:07 -07:00
Daniel Sandler
6a377f3094
Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
2012-10-18 10:24:47 -07:00
Chet Haase
8481ac8fe9
Stop reloading wallpaper bitmap
...
Typo in ImageWallpaper made a dimension check incorrect.
Issue#7373200 pause when toggling between All Apps and Home screen; Home button stays illuminated for a long time
Change-Id: I82763ac8c9ed564eba904f552975ab20c8aef932
2012-10-18 10:12:10 -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
Michael Jurka
c9fb0e24e9
am b2ee13e4: am ec790410: am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev
...
* commit 'b2ee13e40ec5c2b60ba9611154aedbf7b8f24393':
Potential fix for bug 7352816
2012-10-18 08:56:55 -07:00
Michael Jurka
b2ee13e40e
am ec790410: am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev
...
* commit 'ec7904102036c27381a3d3281a9b2ef193690e7e':
Potential fix for bug 7352816
2012-10-18 08:54:29 -07:00
Michael Jurka
ec79041020
am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev
...
* commit '341aa8e0e8753ddb5eca22311e7d671e0518f326':
Potential fix for bug 7352816
2012-10-18 08:52:36 -07:00
Michael Jurka
341aa8e0e8
Merge "Potential fix for bug 7352816" into jb-mr1-dev
2012-10-18 08:48:41 -07:00
Daniel Sandler
720a34d60a
Fix glitch when using settings pulldown then switching to notifications.
...
Bug: 7348917
Change-Id: I65b51bb161934300da9ca0ebf4b184886e3e81df
2012-10-18 11:44:04 -04:00
Daniel Sandler
a6fd272de5
am 328f681d: am b5aa7956: am a4c356ca: Merge "Add missing layout params" into jb-mr1-dev
...
* commit '328f681d39b4a0f09e80fe8ad0e2111928c12700':
Add missing layout params
2012-10-18 06:43:39 -07:00
Daniel Sandler
328f681d39
am b5aa7956: am a4c356ca: Merge "Add missing layout params" into jb-mr1-dev
...
* commit 'b5aa7956a4c7688f3609234090f55a37705c8e30':
Add missing layout params
2012-10-18 06:40:48 -07:00
Daniel Sandler
b5aa7956a4
am a4c356ca: Merge "Add missing layout params" into jb-mr1-dev
...
* commit 'a4c356cad7de0ef30faeaeadacd21b6eae913541':
Add missing layout params
2012-10-18 06:38:45 -07:00
Daniel Sandler
a4c356cad7
Merge "Add missing layout params" into jb-mr1-dev
2012-10-18 06:35:48 -07:00
Jeff Brown
bf9e9b8a6e
am f3c68252: am 1d9cebee: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
...
* commit 'f3c6825207d668c8a0c50faa18f08ae87ae722bd':
Dream when user activity times out while docked if appropriate.
2012-10-18 00:16:46 -07:00
Jeff Brown
a490b64beb
am 05d7709e: am 5561baef: am 586503d5: Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev
...
* commit '05d7709e77f27638f96afbceedcb07ee3ef19a0e':
Add special mirroring modes for demonstration purposes.
2012-10-18 00:16:42 -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 Sharkey
b97c91dbdf
am 9fb2695c: am 628025fd: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev
...
* commit '9fb2695c3ed806a4dee755e730b50935c7bb10f6':
Defer more Account actions until user starting.
2012-10-18 00:12:35 -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
Jeff Sharkey
9fb2695c3e
am 628025fd: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev
...
* commit '628025fd625934346c80ed4849f9e6495f3d1737':
Defer more Account actions until user starting.
2012-10-18 00:05:35 -07:00
Jeff Sharkey
628025fd62
am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev
...
* commit 'bd4f2181077ab35a26bcca115c1337e78814bb9d':
Defer more Account actions until user starting.
2012-10-18 00:03:43 -07:00
Jeff Sharkey
bd4f218107
Merge "Defer more Account actions until user starting." into jb-mr1-dev
2012-10-18 00:00:41 -07:00
Jeff Hamilton
fbadb69978
Changes to support updating location providers.
...
This reverts commit 20de160ca32a8f2936a80ffd70551a22e2371d25.
Bug: 7242814
Change-Id: I9ec49a14feb835b6683186fc6da4a74ae19fbae2
2012-10-18 01:28:10 -05:00
Baligh Uddin
15c18f670e
am 645f7608: (-s ours) am c880ebb4: am 3e336bd6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '645f7608f24ebcec50f3a0865a01331015771379':
Import translations. DO NOT MERGE
2012-10-17 22:33:11 -07:00
Baligh Uddin
1e006a4d61
am 9bbcac88: (-s ours) am 080fa753: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '9bbcac888e68a6cb91f9a5e391a0932a72913388':
Import translations. DO NOT MERGE
2012-10-17 22:33:07 -07:00
Baligh Uddin
645f7608f2
am c880ebb4: am 3e336bd6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c880ebb4360973062fd11eaea7107b274f28daa1':
Import translations. DO NOT MERGE
2012-10-17 22:29:34 -07:00
Baligh Uddin
9bbcac888e
am 080fa753: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '080fa75371e127ab2990645d59a260b8d39f992e':
Import translations. DO NOT MERGE
2012-10-17 22:29:33 -07:00
Baligh Uddin
c880ebb436
am 3e336bd6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '3e336bd6467c3a518b408d6b79117ae507a3c41b':
Import translations. DO NOT MERGE
2012-10-17 22:26:29 -07:00
Baligh Uddin
5965b7f367
Merge "Import translations. DO NOT MERGE"
2012-10-17 22:25:01 -07:00
Baligh Uddin
3e336bd646
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-17 22:23:35 -07:00
Baligh Uddin
080fa75371
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-17 22:19:21 -07:00
Amith Yamasani
1638931166
Allow services to query the info for a dying user.
...
This allows services watching for USER_REMOVED to fetch the serialNumber of a dying user.
Also fix an AIOOBE when building the userId array, typically on cleanup.
Bug: 7368826
Change-Id: I24e52278af8353b5744372127da4bf4fafc89baa
2012-10-17 21:20:14 -07:00
Craig Mautner
160c74bbe8
am 7b77db03: am 450fc70f: am c6ccb29b: Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev
...
* commit '7b77db0378e8aec6f03f71c17e4229d7b7cbb2c2':
Call requestFocus and ensure that screenOn is set.
2012-10-17 20:33:32 -07:00
Craig Mautner
7b77db0378
am 450fc70f: am c6ccb29b: Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev
...
* commit '450fc70ff4900098523f59c766860bce29c693b7':
Call requestFocus and ensure that screenOn is set.
2012-10-17 20:30:33 -07:00
Jeff Brown
ec6aa59454
Dream when user activity times out while docked if appropriate.
...
If the user has requested that dreams start when docked and a user
activity timeout occurs, then start dreaming assuming all of the
other usual conditions are appropriate for dreaming (the device is
powered, etc.).
Previously dreams only started when the device was initial docked
but not if the device fell asleep while remaining docked.
Bug: 7281240
Change-Id: I72c3f854fd1ae8e6615f4fa6e4c4ecd8de37c84b
2012-10-17 20:30:25 -07:00
Craig Mautner
450fc70ff4
am c6ccb29b: Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev
...
* commit 'c6ccb29b9a7d3d8aac37f4cd3bd5b5b134724996':
Call requestFocus and ensure that screenOn is set.
2012-10-17 20:28:32 -07:00
Craig Mautner
c6ccb29b9a
Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev
2012-10-17 20:25:12 -07:00
Daniel Sandler
ff4f345254
am 9657c5e2: am fdebf0fd: am c1dc37cb: Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev
...
* commit '9657c5e2cdced65c710505bd0dfef3de5a637d9e':
You can only use the 2-finger shortcut when opening the panel.
2012-10-17 20:09:40 -07:00
Daniel Sandler
9657c5e2cd
am fdebf0fd: am c1dc37cb: Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev
...
* commit 'fdebf0fda9169b848c1e8eaafbcf3c720a0dabc6':
You can only use the 2-finger shortcut when opening the panel.
2012-10-17 20:06:33 -07:00
Daniel Sandler
fdebf0fda9
am c1dc37cb: Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev
...
* commit 'c1dc37cba785d990cabfd4e27edadd18975f8751':
You can only use the 2-finger shortcut when opening the panel.
2012-10-17 20:04:41 -07:00
Daniel Sandler
c1dc37cba7
Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev
2012-10-17 20:01:34 -07:00
Daniel Sandler
36c06ae04a
Add missing layout params
...
Bug: 7370474
Change-Id: I632832be22c492f006d76bfa821fd9aa48569f67
2012-10-17 22:51:27 -04:00
Romain Guy
05606be858
am 3786a9b9: am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212 " into jb-mr1-dev
...
* commit '3786a9b97a5a149c7f8a68a0f6c4cc4c063be7ac':
Take into account the texture layer's transform for clipping Bug #7370212
2012-10-17 19:23:27 -07:00