Irfan Sheriff
877cc73091
am b98c2fb0: Merge "Do a clean shutdown of p2p" into jb-mr1-dev
...
* commit 'b98c2fb0998b2ad6bffe9c06dd358ba4705eaa4b':
Do a clean shutdown of p2p
2012-10-18 13:46:35 -07:00
Irfan Sheriff
b98c2fb099
Merge "Do a clean shutdown of p2p" into jb-mr1-dev
2012-10-18 13:44:28 -07:00
Irfan Sheriff
62fa6de135
Do a clean shutdown of p2p
...
We were doing a lazy shutdown and stopping supplicant behind p2p's back.
Make sure we stop p2p, before we go ahead with shutting down.
Bug: 7368832
Change-Id: I941e9cd69d6f27532207d3dc00b03c55c0e6335c
2012-10-18 13:35:57 -07:00
Fabrice Di Meglio
fcc3348f61
Fix bug #7374285 GridLayout layout param margins are broken in RTL mode
...
- resolve layout params in ViewGroup when layout direction is changed
- layout param resolution is checking the previous layout direction to
check if we need to resolve
Change-Id: I70af2ad2b4ec83c2ec6c93b3ff445852500d1687
2012-10-18 13:24:03 -07:00
Chet Haase
b3aa6dbbe9
am eeb149ce: am 58e60c23: Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev
...
* commit 'eeb149ce5659fec407652f61befe26111d9b3081':
Track size changes correctly for static wallpapers
2012-10-18 13:02:04 -07:00
Chet Haase
eeb149ce56
am 58e60c23: Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev
...
* commit '58e60c239f1d08a67a154d974cab9711a1dd7ecc':
Track size changes correctly for static wallpapers
2012-10-18 13:00:13 -07:00
Chet Haase
58e60c239f
Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev
2012-10-18 12:57:23 -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
Chet Haase
5f0d976b37
Track size changes correctly for static wallpapers
...
Previous logic compared the surface size to the bitmap size to determine
whether to reload the bitmap. This was based on an assumption that the bitmap
would be created at the same sizea s the surface. However, the process of
how those sizes get determined is different for surfaces and wallpapers, causing
an occasional issue where the bitmap gets reloaded frequently, every time the wallpaper
is asked to redraw, even though it always gets recreated at the same size.
New logic checks previous surface dimensions against current surface dimensions to
determine whether the bitmap should be reloaded; we really only want to reload
it when the surface size changes.
Issue #7373200 pause when toggling between All Apps and Home screen; Home button stays illuminated for a long time
Change-Id: I108777b72bd42616ad7cf8274af1b3e6b2ed94e7
2012-10-18 12:41:54 -07:00
Scott Main
ae19acd489
am d4161658: am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
...
* commit 'd4161658e964ce05aa400de4bc2632d7f4b804d4':
revise code sample for callback interface
2012-10-18 12:36:28 -07:00
Xavier Ducrohet
13c21bc98e
am ebbfdeee: am 5e42147a: am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.
...
* commit 'ebbfdeee38c84e6bb7faccce151b4a0b7d84dfe8':
Update layoutlib for jb mr1. do not merge.
2012-10-18 12:33:40 -07:00
Scott Main
d4161658e9
am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
...
* commit 'e9b533bff02d75fa11df4392d921f7f4d3d9c101':
revise code sample for callback interface
2012-10-18 12:33:33 -07:00
Xavier Ducrohet
ebbfdeee38
am 5e42147a: am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.
...
* commit '5e42147af3a8f284f9caa329c9fbfc994ca1d0da':
Update layoutlib for jb mr1. do not merge.
2012-10-18 12:31:50 -07:00
Scott Main
e9b533bff0
am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
...
* commit '82f0ba79e67c154fc12a6cfde2fe1205da166b0d':
revise code sample for callback interface
2012-10-18 12:31:05 -07:00
Xavier Ducrohet
5e42147af3
am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.
...
* commit '64b3de296cdbc8c02e2890f8853409c6d49cddb1':
Update layoutlib for jb mr1. do not merge.
2012-10-18 12:29:23 -07:00
Scott Main
82f0ba79e6
am 4a6b6948: am 07322102: revise code sample for callback interface
...
* commit '4a6b69488f9fd90bbe04a930ffad8999bc93e173':
revise code sample for callback interface
2012-10-18 12:25:19 -07:00
Xavier Ducrohet
64b3de296c
am 434cd38f: Update layoutlib for jb mr1. do not merge.
...
* commit '434cd38f96a4a87220a8218901622f31e567354a':
Update layoutlib for jb mr1. do not merge.
2012-10-18 12:23:28 -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
Scott Main
98738225e2
am aefc2e62: am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev
...
* commit 'aefc2e6233edab4ec1fd1a74892f87e9fa7dade7':
improve some docs for dreams
2012-10-18 12:21:24 -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
Scott Main
aefc2e6233
am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev
...
* commit 'db164da885d15723597d6a525d0f46cb55dbcb88':
improve some docs for dreams
2012-10-18 12:18:38 -07:00
Scott Main
4a6b69488f
am 07322102: revise code sample for callback interface
...
* commit '07322102e5f1877bc2860d2c72eeeb41839d6bea':
revise code sample for callback interface
2012-10-18 12:18:31 -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
Scott Main
db164da885
Merge "improve some docs for dreams" into jb-mr1-dev
2012-10-18 11:37:30 -07:00
Chet Haase
313b3be249
am d170e189: am 18937b22: Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
...
* commit 'd170e1890bf585545498647850fb82af59b99b8f':
Stop reloading wallpaper bitmap
2012-10-18 11:23:14 -07:00
Chet Haase
d170e1890b
am 18937b22: Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
...
* commit '18937b22099723447388547a2d67f25bde6bdb10':
Stop reloading wallpaper bitmap
2012-10-18 11:20:47 -07:00
Scott Main
6237ac19bf
improve some docs for dreams
...
Change-Id: I7652f4366cdc8c40926d7961582663cc99ca0735
2012-10-18 11:18:31 -07:00
Chet Haase
18937b2209
Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
2012-10-18 11:18:14 -07:00
Xavier Ducrohet
434cd38f96
Update layoutlib for jb mr1. do not merge.
...
Status bar displayed on all devices.
Update logic for displaying nav bar to whether or not
device has soft button.
Update navigation buttons to new look.
Remove battery and signal from navigation bar.
(cherry picked from commit 891b703f7b1e0e396d16477cc66a286da7161b49)
Change-Id: Id7cc9ad4255d2c4d2e6461a565dfe2cc17e12e75
2012-10-18 11:15:39 -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
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
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
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