Jeff Sharkey
25b99efb32
am ac0cb359: am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev
...
* commit 'ac0cb3591a637533c1f0329fd00a621fbe1fd997':
Add extras to AFD, send orientation metadata.
2013-10-14 19:00:51 -07:00
Craig Mautner
73b25d6ac0
am bd0a4143: am b3a08be2: Merge "Use dialog animations for dialog style." into klp-dev
...
* commit 'bd0a4143302834c3d1a1343e82f6d4da7888308e':
Use dialog animations for dialog style.
2013-10-14 19:00:47 -07:00
Martijn Coenen
e7a81e7a87
am 47936bb8: am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev
...
* commit '47936bb8f5192496b8007009f8732a9d7194b2ac':
NFC card emulation API docs.
2013-10-14 19:00:44 -07:00
Svetoslav Ganov
2f8079753d
am f62e2629: am fe3b58fb: Merge "Update the print spooler action bar icon." into klp-dev
...
* commit 'f62e262932daaea8b5eda3893a56e2fdbb17ea0a':
Update the print spooler action bar icon.
2013-10-14 19:00:41 -07:00
Svetoslav
9773b379fe
am 79662942: am c89e5a6a: Merge "Layout may be called with invalid print attributes." into klp-dev
...
* commit '796629422f3023c1cc3c8d970f5b66c1b34599d2':
Layout may be called with invalid print attributes.
2013-10-14 19:00:38 -07:00
Craig Mautner
0e10dfebf1
am 2c345435: am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." into klp-dev
...
* commit '2c345435458b8b6ad105bf14d3655e0f6836278b':
Move the wallpaper beneath the keyguard.
2013-10-14 19:00:35 -07:00
Robert Greenwalt
6becff179d
am 87408ffd: am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev
...
* commit '87408ffda1d101efb2cc56b657468318374488d9':
Fix change to re-add carrier roaming details.
2013-10-14 19:00:32 -07:00
Adam Lesinski
04e2a47ab7
am 461f06f4: am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev
...
* commit '461f06f4037849d5075d947852306bafdf0e949c':
Wrap measurement optimization in targetSdk check
2013-10-14 19:00:28 -07:00
Michael Jurka
10f6465080
am 0396d55b: am b4c3b096: Merge "Add EXIF rotation support to system wallpaper cropper" into klp-dev
...
* commit '0396d55b056113cddb74f3fc9dde9e2299897516':
Add EXIF rotation support to system wallpaper cropper
2013-10-14 19:00:24 -07:00
Wink Saville
f349ec0e5d
am d1fcafa9: am 3fd9cb15: Merge "Telephony: Read signal strength values as expected" into klp-dev
...
* commit 'd1fcafa996a9334ad2f0a8d7e1276d3e446b6216':
Telephony: Read signal strength values as expected
2013-10-14 19:00:21 -07:00
Jim Miller
566c4a0bc5
am 6915644d: am f7b75eeb: Merge "Add additional MNC overlays" into klp-dev
...
* commit '6915644d5b978706e147ae1fc4f91bb3d3641c11':
Add additional MNC overlays
2013-10-14 19:00:17 -07:00
Vineeta Srivastava
26e9f9254a
am 4967abcf: am 1680cfd8: Merge "Modify config.xml for tethering APN information." into klp-dev
...
* commit '4967abcf2cce60e5a33e0bb9f0464b0897e65240':
Modify config.xml for tethering APN information.
2013-10-14 19:00:13 -07:00
Daniel Sandler
c963dfb27a
am 596b1f86: am dd73ee4d: Add a config resource to enable translucent bars globally.
...
* commit '596b1f86ff1a3457a514e1d383d14ef0defc4d53':
Add a config resource to enable translucent bars globally.
2013-10-14 19:00:10 -07:00
Scott Main
c13dd15c55
am 12191d2a: am 306ed4fd: am 3a920545: am 2cc953f1: am 9006c422: more documentation for SEND_RESPOND_VIA_MESSAGE
...
* commit '12191d2ad5fae77a0fcb98948da2813977430b54':
more documentation for SEND_RESPOND_VIA_MESSAGE
2013-10-14 19:00:06 -07:00
Christopher Tate
6b013b753c
am 5c742333: am b83bba7c: Merge "Log noisily on uid vs user-handle confusion in the settings provider" into klp-dev
...
* commit '5c74233315fd3b4ff9710624996b2312bbbaca5e':
Log noisily on uid vs user-handle confusion in the settings provider
2013-10-14 19:00:03 -07:00
Jeff Sharkey
ac0cb3591a
am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev
...
* commit '8e656df0929b352660fd6d6209eabc4267c1941f':
Add extras to AFD, send orientation metadata.
2013-10-14 17:20:09 -07:00
Craig Mautner
bd0a414330
am b3a08be2: Merge "Use dialog animations for dialog style." into klp-dev
...
* commit 'b3a08be2a1a39ff2b1e59975e55b7c9f0171b177':
Use dialog animations for dialog style.
2013-10-14 17:19:56 -07:00
Martijn Coenen
47936bb8f5
am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev
...
* commit '7d91cc97d788aae9f3a6ac5540580cc95591e356':
NFC card emulation API docs.
2013-10-14 17:19:49 -07:00
Svetoslav Ganov
f62e262932
am fe3b58fb: Merge "Update the print spooler action bar icon." into klp-dev
...
* commit 'fe3b58fbed7a02d3e9f559ed2f814b42934dc784':
Update the print spooler action bar icon.
2013-10-14 17:19:36 -07:00
Svetoslav
796629422f
am c89e5a6a: Merge "Layout may be called with invalid print attributes." into klp-dev
...
* commit 'c89e5a6af1514320f90329dadebdfa26a3ae93d2':
Layout may be called with invalid print attributes.
2013-10-14 17:19:34 -07:00
Craig Mautner
2c34543545
am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." into klp-dev
...
* commit '79a0ed5848379b1f587bcc55a8a8b9417df6303b':
Move the wallpaper beneath the keyguard.
2013-10-14 17:19:27 -07:00
Robert Greenwalt
87408ffda1
am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev
...
* commit 'f64247e417ffcffb76bd47af417f4f3623073f88':
Fix change to re-add carrier roaming details.
2013-10-14 17:19:20 -07:00
Adam Lesinski
461f06f403
am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev
...
* commit '53a5e3175acb6e2bd23c25c1e4cba0789e47488f':
Wrap measurement optimization in targetSdk check
2013-10-14 17:19:16 -07:00
Michael Jurka
0396d55b05
am b4c3b096: Merge "Add EXIF rotation support to system wallpaper cropper" into klp-dev
...
* commit 'b4c3b09683de31e016ec5a358eed014b0e4111a3':
Add EXIF rotation support to system wallpaper cropper
2013-10-14 17:19:11 -07:00
Wink Saville
d1fcafa996
am 3fd9cb15: Merge "Telephony: Read signal strength values as expected" into klp-dev
...
* commit '3fd9cb155c2b4c28eed9cd886a3dfb01854f477b':
Telephony: Read signal strength values as expected
2013-10-14 17:19:08 -07:00
Jim Miller
6915644d5b
am f7b75eeb: Merge "Add additional MNC overlays" into klp-dev
...
* commit 'f7b75eeb7efb84a2da5e28b4dcd979009f443e43':
Add additional MNC overlays
2013-10-14 17:19:02 -07:00
Vineeta Srivastava
4967abcf2c
am 1680cfd8: Merge "Modify config.xml for tethering APN information." into klp-dev
...
* commit '1680cfd803d6a435ce4c809075d052da2723ac07':
Modify config.xml for tethering APN information.
2013-10-14 17:18:21 -07:00
Daniel Sandler
596b1f86ff
am dd73ee4d: Add a config resource to enable translucent bars globally.
...
* commit 'dd73ee4d0a33aa9a423b80471aec6d1ec81a6c82':
Add a config resource to enable translucent bars globally.
2013-10-14 17:18:15 -07:00
Scott Main
12191d2ad5
am 306ed4fd: am 3a920545: am 2cc953f1: am 9006c422: more documentation for SEND_RESPOND_VIA_MESSAGE
...
* commit '306ed4fd4f7e05d0e87b06816fd8bc6bc7d91846':
more documentation for SEND_RESPOND_VIA_MESSAGE
2013-10-14 17:18:06 -07:00
Christopher Tate
5c74233315
am b83bba7c: Merge "Log noisily on uid vs user-handle confusion in the settings provider" into klp-dev
...
* commit 'b83bba7c353de6ac1af7c5770c48d1f323acb97e':
Log noisily on uid vs user-handle confusion in the settings provider
2013-10-14 17:18:03 -07:00
Jeff Sharkey
8e656df092
Merge "Add extras to AFD, send orientation metadata." into klp-dev
2013-10-15 00:00:20 +00:00
Craig Mautner
b3a08be2a1
Merge "Use dialog animations for dialog style." into klp-dev
2013-10-14 23:45:30 +00:00
Martijn Coenen
7d91cc97d7
Merge "NFC card emulation API docs." into klp-dev
2013-10-14 23:30:21 +00:00
Craig Mautner
d2d76ac6b9
Use dialog animations for dialog style.
...
Using activity animations on non-fullscreen activities that sit over
a wallpaper activity cause the exiting activity to show up underneath
the next activity. If the next activity happens to be a wallpaper
activity then this will be janky as the exiting activity will go from
on top of the incoming activity to on top of the wallpaper as it
animates away.
Fixes bug 11200253.
Change-Id: I7e81c50cfe7ae106da2d62f5866f43fc046181c5
2013-10-14 15:52:58 -07:00
Svetoslav Ganov
fe3b58fbed
Merge "Update the print spooler action bar icon." into klp-dev
2013-10-14 22:48:46 +00:00
Svetoslav
c89e5a6af1
Merge "Layout may be called with invalid print attributes." into klp-dev
2013-10-14 22:48:20 +00:00
Jeff Sharkey
c1c8f3f97d
Add extras to AFD, send orientation metadata.
...
AssetFileDescriptor augments a ParcelFileDescriptor with details
about how it should be interpreted, so extend it to support a Bundle
of extras. Then use these extras to share thumbnail orientation
metadata.
The raw image data of EXIF thumbnails matches the orientation of
the enclosing image, but the thumbnail data doesn't repeat the EXIF
flags. This meant that receivers of openDocumentThumbnail() would
get an image that needed to be transformed, but without enough
context to actually transform it.
Instead of transforming and recompressing the image on the fly on
the provider side, send a transformation hint that the receiver
side can interpret.
Bug: 11205688
Change-Id: Ibc5a7ad002377a55e6ffcb5ac5c8829841002e06
2013-10-14 15:28:19 -07:00
Craig Mautner
79a0ed5848
Merge "Move the wallpaper beneath the keyguard." into klp-dev
2013-10-14 22:24:44 +00:00
Robert Greenwalt
f64247e417
Merge "Fix change to re-add carrier roaming details." into klp-dev
2013-10-14 22:11:02 +00:00
Adam Lesinski
53a5e3175a
Merge "Wrap measurement optimization in targetSdk check" into klp-dev
2013-10-14 22:06:07 +00:00
Michael Jurka
b4c3b09683
Merge "Add EXIF rotation support to system wallpaper cropper" into klp-dev
2013-10-14 22:03:09 +00:00
Wink Saville
3fd9cb155c
Merge "Telephony: Read signal strength values as expected" into klp-dev
2013-10-14 21:58:57 +00:00
Robert Greenwalt
4df84602fd
Fix change to re-add carrier roaming details.
...
bug:11176211
Change-Id: Ibde8bd4b98df781a3c851d97a893da88c161d98b
2013-10-14 14:50:33 -07:00
Michael Jurka
69784065ea
Add EXIF rotation support to system wallpaper cropper
...
Bug: 11137824
2013-10-14 14:44:36 -07:00
Jim Miller
f7b75eeb7e
Merge "Add additional MNC overlays" into klp-dev
2013-10-14 21:25:30 +00:00
Kenny Root
7a2f4ae132
am 69779458: am 7878883e: Merge "Remove direct reference to X509CertImpl"
...
* commit '69779458aeef3fa9d9c6f54487784cf558c850e8':
Remove direct reference to X509CertImpl
2013-10-14 14:04:55 -07:00
Kenny Root
69779458ae
am 7878883e: Merge "Remove direct reference to X509CertImpl"
...
* commit '7878883ed922f17c930c0d40588f62acf73f9a9c':
Remove direct reference to X509CertImpl
2013-10-14 14:02:52 -07:00
Kenny Root
7878883ed9
Merge "Remove direct reference to X509CertImpl"
2013-10-14 20:59:48 +00:00
Jim Miller
0ed6d68496
Add additional MNC overlays
...
Fixes bug 10518893
Change-Id: If8f46202f593e545fe38c4803481b266b60543b9
2013-10-14 13:57:46 -07:00
Craig Mautner
5800443e2d
Move the wallpaper beneath the keyguard.
...
If the keyguard is the wallpaper target the wallpaper cannot sit at
the bottom of the stack and must be directly beneath the keyguard.
Otherwise keep it at the bottom of the window stack.
App animations when the keyguard is showing should not be disabled if
the keyguard is also animating.
Fixes bug 10858941.
Fixes bug 10932680.
Change-Id: I8399837f6510ea16003f68b165e67439f3571ef4
2013-10-14 13:52:28 -07:00