OSDN Git Service
Baligh Uddin [Sat, 12 Oct 2013 00:34:14 +0000 (17:34 -0700)]
am
5a531ff9: (-s ours) am
ea9aec27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5a531ff96081c20cab087306907c406076a10ddb':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 00:34:11 +0000 (17:34 -0700)]
am
a57076e8: (-s ours) am
3c10347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a57076e820731347236e69aee8abab73f2ab2ad2':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 00:34:07 +0000 (17:34 -0700)]
am
db79e4d4: (-s ours) am
84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
db79e4d41d21cf7daf403d680851d78c6c59a2af':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 00:30:31 +0000 (17:30 -0700)]
am
b43e0ead: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
b43e0eadbe144eae189ecf9f26005fd76d9f31d6':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 00:30:28 +0000 (17:30 -0700)]
am
8cdfa5cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
8cdfa5cd18ecf552f99c826797951a9a86c2af3c':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 00:30:25 +0000 (17:30 -0700)]
am
adb1b5b4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
adb1b5b43f517751151835e2143d53ad3666ac8e':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 00:30:23 +0000 (17:30 -0700)]
am
4bb81ac8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
4bb81ac838dd910ea4a8dded676d70d4e399eed9':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 00:29:40 +0000 (17:29 -0700)]
am
ea9aec27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ea9aec27cc792027c94fe2d1d60586efb4f85d24':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 00:29:36 +0000 (17:29 -0700)]
am
3c10347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3c10347cdb84db55320d964778ff684f059cecad':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 00:29:33 +0000 (17:29 -0700)]
am
84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
84f5bf823972b87be1ee0334f96a2ed3216e81a7':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 00:27:48 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:27:30 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:27:15 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 12 Oct 2013 00:26:49 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:26:44 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Svetoslav [Sat, 12 Oct 2013 00:26:42 +0000 (17:26 -0700)]
am
1f5c1f3e: am
036f05b8: Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev
* commit '
1f5c1f3eee2df06ae42bc9e2bb9b5502316502cc':
Putting the cursor at the end of the copies and range inputs.
Baligh Uddin [Sat, 12 Oct 2013 00:26:28 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:26:23 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Svetoslav [Sat, 12 Oct 2013 00:22:56 +0000 (17:22 -0700)]
am
036f05b8: Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev
* commit '
036f05b8b0dabc72e6ce68372516c3d98da137e4':
Putting the cursor at the end of the copies and range inputs.
Svetoslav [Sat, 12 Oct 2013 00:21:12 +0000 (00:21 +0000)]
Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev
Chris Craik [Sat, 12 Oct 2013 00:14:12 +0000 (17:14 -0700)]
am
8d56f667: am
709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev
* commit '
8d56f667243292ed002dce81498be0e4d4a3ea59':
Document special case in hasOverlappingRendering
Chris Craik [Sat, 12 Oct 2013 00:11:18 +0000 (17:11 -0700)]
am
709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev
* commit '
709129ba939f9d09887506540bcbb573086b3f15':
Document special case in hasOverlappingRendering
Chris Craik [Sat, 12 Oct 2013 00:08:08 +0000 (00:08 +0000)]
Merge "Document special case in hasOverlappingRendering" into klp-dev
Svetoslav [Sat, 12 Oct 2013 00:00:45 +0000 (17:00 -0700)]
Putting the cursor at the end of the copies and range inputs.
bug:
10983508
Change-Id: I767876fada2f28b00283ed9140fca1a40729f38f
Chris Craik [Fri, 11 Oct 2013 21:17:21 +0000 (14:17 -0700)]
Document special case in hasOverlappingRendering
bug:
11121809
Change-Id: I074ac47aa510bd2362cfda7dffc73930f07e925c
Baligh Uddin [Fri, 11 Oct 2013 23:45:22 +0000 (16:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2b2abc0ab598637d4762135082fc79c7205c332f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 23:33:07 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68d6709509ea86f19862bb7ea5319d405dcd7c10
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 23:31:18 +0000 (16:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I66efc38992968ef463f4d02f1af101053adfb41e
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 23:27:10 +0000 (16:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2d70b403a7c4ba6b6023b71bf1d66e01575278d
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 23:25:46 +0000 (16:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d1fd0e44df5ea45d590e675e1f2d0afda54bc69
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 23:22:18 +0000 (16:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55d4cf3dec38ad38792f855335c9fe9d2cc4624d
Auto-generated-cl: translation import
Baligh Uddin [Fri, 11 Oct 2013 23:21:25 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0ca278dcf2291ed0919f46eeaff99c1ca61969ae
Auto-generated-cl: translation import
Jim Miller [Fri, 11 Oct 2013 21:43:55 +0000 (14:43 -0700)]
am
51f2d8ef: am
11def8f0: Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev
* commit '
51f2d8ef9da5008dda4b99157774327ed9138ab8':
Delay all widget additions in keyguard until after boot completes
Jim Miller [Fri, 11 Oct 2013 21:40:57 +0000 (14:40 -0700)]
am
11def8f0: Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev
* commit '
11def8f06a3c03a0056e9fa010b28622d9d88d2b':
Delay all widget additions in keyguard until after boot completes
Jim Miller [Fri, 11 Oct 2013 21:38:04 +0000 (21:38 +0000)]
Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev
Jeff Sharkey [Fri, 11 Oct 2013 21:36:59 +0000 (14:36 -0700)]
am
2dbe1627: am
12ad9ce2: Merge "Fix spelling." into klp-dev
* commit '
2dbe16277daab31c62a1dc63dbb6768eb1b407a8':
Fix spelling.
Svetoslav [Fri, 11 Oct 2013 21:36:56 +0000 (14:36 -0700)]
am
8e80d1f9: am
33021d95: Merge "Adding timeout if the current printer or its capabilities disappear." into klp-dev
* commit '
8e80d1f953932ad867ff4f0b23b466565f1b15f0':
Adding timeout if the current printer or its capabilities disappear.
Matthew Williams [Fri, 11 Oct 2013 21:33:18 +0000 (14:33 -0700)]
am
e0a2bdaf: am
32551ae5: Merge "Fix infinite boot-loop bug in SM." into klp-dev
* commit '
e0a2bdaf61a7a72e92d614f81f86e7fd441b38e4':
Fix infinite boot-loop bug in SM.
Jeff Sharkey [Fri, 11 Oct 2013 21:33:03 +0000 (14:33 -0700)]
am
12ad9ce2: Merge "Fix spelling." into klp-dev
* commit '
12ad9ce23e1d1fd07c07e683c191e6bc028c4407':
Fix spelling.
Svetoslav [Fri, 11 Oct 2013 21:32:59 +0000 (14:32 -0700)]
am
33021d95: Merge "Adding timeout if the current printer or its capabilities disappear." into klp-dev
* commit '
33021d95a8f3ca127c1df6aeb54c3a9219f46093':
Adding timeout if the current printer or its capabilities disappear.
Jeff Sharkey [Fri, 11 Oct 2013 21:30:54 +0000 (21:30 +0000)]
Merge "Fix spelling." into klp-dev
Svetoslav [Fri, 11 Oct 2013 21:30:01 +0000 (21:30 +0000)]
Merge "Adding timeout if the current printer or its capabilities disappear." into klp-dev
Matthew Williams [Fri, 11 Oct 2013 21:29:30 +0000 (14:29 -0700)]
am
32551ae5: Merge "Fix infinite boot-loop bug in SM." into klp-dev
* commit '
32551ae5197744425d3057dc5d449e7943d35ba2':
Fix infinite boot-loop bug in SM.
Matthew Williams [Fri, 11 Oct 2013 21:26:19 +0000 (21:26 +0000)]
Merge "Fix infinite boot-loop bug in SM." into klp-dev
Jeff Sharkey [Fri, 11 Oct 2013 21:25:48 +0000 (14:25 -0700)]
Fix spelling.
Change-Id: Ibcc5a5b976e185c4a6605b18b645b05a5c00f3ec
Jean-Michel Trivi [Fri, 11 Oct 2013 21:17:43 +0000 (14:17 -0700)]
am
fb059f3c: am
7a6ccb87: Merge "Remote volume changes" into klp-dev
* commit '
fb059f3c412733d962f99577f097e91c2badb10e':
Remote volume changes
Jean-Michel Trivi [Fri, 11 Oct 2013 21:14:44 +0000 (14:14 -0700)]
am
7a6ccb87: Merge "Remote volume changes" into klp-dev
* commit '
7a6ccb87290f12203e00cbddcffc2fbee35cebd3':
Remote volume changes
Jean-Michel Trivi [Fri, 11 Oct 2013 21:12:22 +0000 (21:12 +0000)]
Merge "Remote volume changes" into klp-dev
Chris Craik [Fri, 11 Oct 2013 21:06:38 +0000 (14:06 -0700)]
am
1ae78c07: am
c2245e1a: Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev
* commit '
1ae78c07807e0db300f965bf3b0371f3eddc2d15':
Workaround fading edge incompatibility with alpha modulation
Svetoslav [Fri, 11 Oct 2013 20:56:08 +0000 (13:56 -0700)]
Adding timeout if the current printer or its capabilities disappear.
If the current printer becomes unavailable or its capabilities
go away we are scheduling a timeout to declare the printer as
unavailable.
bug:
10983508
Change-Id: Iab85cfd35fc0cecc3dd4abac6232347f9da18fb0
Chris Craik [Fri, 11 Oct 2013 21:00:31 +0000 (14:00 -0700)]
am
c2245e1a: Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev
* commit '
c2245e1ac7b4419936e9891113d9c1e7ea7d65d4':
Workaround fading edge incompatibility with alpha modulation
Svetoslav [Fri, 11 Oct 2013 20:59:39 +0000 (13:59 -0700)]
am
c8c943a9: am
3691dd06: Merge "Print spooler not starting." into klp-dev
* commit '
c8c943a93044f63e27b725901568dc62a84606a8':
Print spooler not starting.
Chris Craik [Fri, 11 Oct 2013 20:57:34 +0000 (20:57 +0000)]
Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev
Svetoslav [Fri, 11 Oct 2013 20:56:59 +0000 (13:56 -0700)]
am
3691dd06: Merge "Print spooler not starting." into klp-dev
* commit '
3691dd063f297162facebf723ac53831126395b5':
Print spooler not starting.
Svetoslav [Fri, 11 Oct 2013 20:55:00 +0000 (20:55 +0000)]
Merge "Print spooler not starting." into klp-dev
Matthew Williams [Thu, 10 Oct 2013 22:51:00 +0000 (15:51 -0700)]
Fix infinite boot-loop bug in SM.
Bug:
11064918
If the ContentResolver sync API is used with the empty ("")
string as a provider, the ContentService will throw an RTE.
This cl addresses all the entry points of the API that could
allow this, as well as adds an ifEmpty check at the point of
failure.
Also removed RTE throws from public functions(no point in
crashing the phone).
Change-Id: I57427d12a6cafb3e6d7a32ca0c10b05315b20580
Chris Craik [Fri, 11 Oct 2013 19:51:11 +0000 (12:51 -0700)]
Workaround fading edge incompatibility with alpha modulation
bug:
11121809
Fading edges, such as drawn by a scrolling marquee TextView, don't
behave correctly when their view is modulated, as done by the view
system when alpha is set on a view that returns false from
hasOverlappingRendering.
To work around this, always return true from hasOverlappingRendering
if a TextView has horizontal fading edges enabled.
Change-Id: I64c9b8c653aa1d9ca320292306fd24333e3ee225
Craig Mautner [Fri, 11 Oct 2013 19:55:36 +0000 (12:55 -0700)]
am
b1ce68f5: am
09cb9bdc: Merge "Add test for topmost home stack activity being home." into klp-dev
* commit '
b1ce68f5a4064d6c57cdc13e4708a0ee6bf5b970':
Add test for topmost home stack activity being home.
Craig Mautner [Fri, 11 Oct 2013 19:52:24 +0000 (12:52 -0700)]
am
09cb9bdc: Merge "Add test for topmost home stack activity being home." into klp-dev
* commit '
09cb9bdcc8949605e5a26ab50ac73970d1092978':
Add test for topmost home stack activity being home.
Scott Main [Fri, 11 Oct 2013 19:50:17 +0000 (12:50 -0700)]
am
d5786ca0: am
1001cf21: am
eae969c1: am
439c4b47: am
c0da3f1d: media-formats.html: clarify WebP availability
* commit '
d5786ca0a6773f0aa6dbccbf1f894cccb8c2cfc9':
media-formats.html: clarify WebP availability
Jeff Sharkey [Fri, 11 Oct 2013 19:50:12 +0000 (12:50 -0700)]
am
ce05cbc5: am
6e19feb4: Merge "Treat dates near epoch as unknown." into klp-dev
* commit '
ce05cbc5ec52417f1f927be2b3d9b93e0881a4d9':
Treat dates near epoch as unknown.
Craig Mautner [Fri, 11 Oct 2013 19:50:05 +0000 (12:50 -0700)]
am
4732660a: am
ab3276dd: Merge "Make an exception for screenshot optimization." into klp-dev
* commit '
4732660a50f3373812e8ae55cbda264d469bfded':
Make an exception for screenshot optimization.
Craig Mautner [Fri, 11 Oct 2013 19:50:02 +0000 (19:50 +0000)]
Merge "Add test for topmost home stack activity being home." into klp-dev
Svetoslav [Fri, 11 Oct 2013 18:28:30 +0000 (11:28 -0700)]
Print spooler not starting.
1. In my previous change I fixed a typo in the Java constant with
intent action to launch the print dialog but failed to updated
the print spooler manifest.
2. Removed dead code - the user id is no longer needed since the
spooler is an app that runs per user. Every user has its spooler.
This code was not referenced from anywhere.
3. Added a default icon to the print spooler.
4. Fixed a bug where if the print history is empty the UI goes
to the all pritners activity.
bug:
11059554
Change-Id: If74c23b418a8c67620ba14435ee7f3b2c4527099
Scott Main [Fri, 11 Oct 2013 19:37:53 +0000 (12:37 -0700)]
am
1001cf21: am
eae969c1: am
439c4b47: am
c0da3f1d: media-formats.html: clarify WebP availability
* commit '
1001cf21ed98d7be4485a764eda5b74012bed7b7':
media-formats.html: clarify WebP availability
Scott Main [Fri, 11 Oct 2013 19:32:48 +0000 (12:32 -0700)]
am
eae969c1: am
439c4b47: am
c0da3f1d: media-formats.html: clarify WebP availability
* commit '
eae969c17a6507c6985b5d9be1f6e0523766f6dd':
media-formats.html: clarify WebP availability
Scott Main [Fri, 11 Oct 2013 19:30:43 +0000 (12:30 -0700)]
am
439c4b47: am
c0da3f1d: media-formats.html: clarify WebP availability
* commit '
439c4b4783ec9e800e9a6fd6fc38dd393c41b77b':
media-formats.html: clarify WebP availability
Scott Main [Fri, 11 Oct 2013 19:27:13 +0000 (12:27 -0700)]
am
c0da3f1d: media-formats.html: clarify WebP availability
* commit '
c0da3f1d60f99c3188906d429ed38edbdd934f12':
media-formats.html: clarify WebP availability
Jeff Sharkey [Fri, 11 Oct 2013 19:23:35 +0000 (12:23 -0700)]
am
6e19feb4: Merge "Treat dates near epoch as unknown." into klp-dev
* commit '
6e19feb4f3da02916754636d3ade340dcd5412d5':
Treat dates near epoch as unknown.
Jeff Sharkey [Fri, 11 Oct 2013 19:18:50 +0000 (19:18 +0000)]
Merge "Treat dates near epoch as unknown." into klp-dev
Scott Main [Fri, 11 Oct 2013 19:03:12 +0000 (12:03 -0700)]
media-formats.html: clarify WebP availability
Lossless and transparency support were added in JB-MR1
CL copied from https://critique.corp.google.com/#review/
53655564
Change-Id: I2c568525ff7c7a540328e41a57b6f16647733e4e
Craig Mautner [Fri, 11 Oct 2013 18:57:07 +0000 (11:57 -0700)]
Add test for topmost home stack activity being home.
And restarts home if test fails.
Fixes bug
11118615.
Change-Id: I3b6c544d479b467f10febff512798c2db8e32f74
Craig Mautner [Fri, 11 Oct 2013 18:45:08 +0000 (11:45 -0700)]
am
ab3276dd: Merge "Make an exception for screenshot optimization." into klp-dev
* commit '
ab3276ddd902b44a81fc6973c5256b6e7e027fd1':
Make an exception for screenshot optimization.
Craig Mautner [Fri, 11 Oct 2013 18:41:45 +0000 (18:41 +0000)]
Merge "Make an exception for screenshot optimization." into klp-dev
Jean-Michel Trivi [Fri, 11 Oct 2013 01:12:59 +0000 (18:12 -0700)]
Remote volume changes
When the user plays media remotely, and presses on the volume
keys with the screen off, verify whether not only local playback
is active, but also if remote playback is active to see if
the volume should be adjusted.
When adjusting the volume with screen off, adjust the remote
volume if applicable.
When controlling volume, give priority to local media playback.
Bug
11169862
Change-Id: I88a8c003969177d50d4c1569ec6cd2a7c153a341
Craig Mautner [Fri, 11 Oct 2013 18:05:35 +0000 (11:05 -0700)]
Make an exception for screenshot optimization.
Screenshots were not being made for tasks with the flag
FLAG_EXCLUDE_FROM_RECENTS set. But if the task is in the foreground
the shot should be taken even with the flag set. This fix adds a test
for tasks being in the foreground.
Fixes bug
11170567.
Change-Id: If42db7f43ed1dd8d2b16b68824adc813b31c94f0
Alan Viverette [Fri, 11 Oct 2013 17:37:01 +0000 (10:37 -0700)]
am
625f3978: am
8da6bc53: Merge "Resize lock screen widgets when IME is open." into klp-dev
* commit '
625f397843f2799756577791478e132ce9f55063':
Resize lock screen widgets when IME is open.
Alan Viverette [Fri, 11 Oct 2013 17:34:08 +0000 (10:34 -0700)]
am
8da6bc53: Merge "Resize lock screen widgets when IME is open." into klp-dev
* commit '
8da6bc53c89020de7e6c252bcb1e658f4fb0c32f':
Resize lock screen widgets when IME is open.
John Spurlock [Fri, 11 Oct 2013 17:32:16 +0000 (10:32 -0700)]
am
b8818120: am
e2bd7be2: Merge "Ensure fitSystemWindows is called on the IME at least once." into klp-dev
* commit '
b8818120ce58b54c7f4f4a1b42f1513bfda34129':
Ensure fitSystemWindows is called on the IME at least once.
Alan Viverette [Fri, 11 Oct 2013 17:30:58 +0000 (17:30 +0000)]
Merge "Resize lock screen widgets when IME is open." into klp-dev
John Spurlock [Fri, 11 Oct 2013 17:29:33 +0000 (10:29 -0700)]
am
e2bd7be2: Merge "Ensure fitSystemWindows is called on the IME at least once." into klp-dev
* commit '
e2bd7be298448602568e56a8cb6c3d7de3c08955':
Ensure fitSystemWindows is called on the IME at least once.
John Spurlock [Fri, 11 Oct 2013 17:27:25 +0000 (17:27 +0000)]
Merge "Ensure fitSystemWindows is called on the IME at least once." into klp-dev
John Spurlock [Fri, 11 Oct 2013 17:16:23 +0000 (13:16 -0400)]
Ensure fitSystemWindows is called on the IME at least once.
InputMethodService will recreate the entire layout on config changes.
Until the system insets change again, the new instance will not
hear about the insets.
This change ensures fitSystemWindows is called at least once for all
input method root views that are added to a window.
Bug:
11174545
Change-Id: Id0f02f32c0d6e9c2d6b6aeef74a12a13acfbb9e6
Svetoslav Ganov [Fri, 11 Oct 2013 17:09:39 +0000 (10:09 -0700)]
am
9ce7ae3e: am
f22a767e: Merge "Added UI for errors during layout and write." into klp-dev
* commit '
9ce7ae3e2001f378199845d4c14b4304a60b3daf':
Added UI for errors during layout and write.
Svetoslav Ganov [Fri, 11 Oct 2013 17:08:00 +0000 (10:08 -0700)]
am
f22a767e: Merge "Added UI for errors during layout and write." into klp-dev
* commit '
f22a767e872ec8f5c2531a88819e0f4574c78fe3':
Added UI for errors during layout and write.
Svetoslav Ganov [Fri, 11 Oct 2013 17:06:12 +0000 (17:06 +0000)]
Merge "Added UI for errors during layout and write." into klp-dev
Svetoslav [Fri, 11 Oct 2013 17:06:03 +0000 (10:06 -0700)]
am
6f688e87: am
8f34715b: Merge "Refactor how the print dialog activity is started." into klp-dev
* commit '
6f688e879a2523393e8e0da072e1f62cb456276f':
Refactor how the print dialog activity is started.
Svetoslav [Fri, 11 Oct 2013 17:04:27 +0000 (10:04 -0700)]
am
8f34715b: Merge "Refactor how the print dialog activity is started." into klp-dev
* commit '
8f34715b94a1733f4cc5f31426d5dafcd57052c7':
Refactor how the print dialog activity is started.
Svetoslav Ganov [Wed, 9 Oct 2013 17:53:26 +0000 (10:53 -0700)]
Added UI for errors during layout and write.
1. If an error happens during layout or write we show an error
message with the string provided by the application which
has an OK button to retry or tap outside to cancel.
2. Updated the targed and min SDK version for the PrintSpooler.
bug:
11127269
Change-Id: I4301cf3716119b1e33b95347a8451fc1c128343b
Svetoslav [Fri, 11 Oct 2013 17:01:14 +0000 (17:01 +0000)]
Merge "Refactor how the print dialog activity is started." into klp-dev
Craig Mautner [Fri, 11 Oct 2013 16:54:30 +0000 (09:54 -0700)]
am
9ccc082c: am
d69417d2: Merge "Reduce jank on incoming phone call during dream." into klp-dev
* commit '
9ccc082c9a6c41833206d54c85e115d6d1659a12':
Reduce jank on incoming phone call during dream.
Craig Mautner [Fri, 11 Oct 2013 16:52:54 +0000 (09:52 -0700)]
am
d69417d2: Merge "Reduce jank on incoming phone call during dream." into klp-dev
* commit '
d69417d2f62606af76ec4cea72bff089ff27b2f2':
Reduce jank on incoming phone call during dream.
Craig Mautner [Fri, 11 Oct 2013 16:49:55 +0000 (16:49 +0000)]
Merge "Reduce jank on incoming phone call during dream." into klp-dev
Dianne Hackborn [Fri, 11 Oct 2013 16:49:51 +0000 (09:49 -0700)]
am
41920afa: am
0b713a09: Merge "Small IntentFilter docs improvement." into klp-dev
* commit '
41920afa54e67010eec146341bce113f05c9d7c3':
Small IntentFilter docs improvement.
Jeff Sharkey [Fri, 11 Oct 2013 16:49:03 +0000 (09:49 -0700)]
Treat dates near epoch as unknown.
Also document that rootIds need to be stable, so removable media
roots should use the media serial number.
Bug:
11151557
Change-Id: I1f3dcabcd0474f1bf92d2cafb0f37e82abe34e05
Dianne Hackborn [Fri, 11 Oct 2013 16:47:16 +0000 (09:47 -0700)]
am
0b713a09: Merge "Small IntentFilter docs improvement." into klp-dev
* commit '
0b713a096171d27ed832175b31abff2b870de44e':
Small IntentFilter docs improvement.
Dianne Hackborn [Fri, 11 Oct 2013 16:42:39 +0000 (16:42 +0000)]
Merge "Small IntentFilter docs improvement." into klp-dev
Dianne Hackborn [Fri, 11 Oct 2013 16:40:18 +0000 (09:40 -0700)]
Small IntentFilter docs improvement.
Change-Id: I52522e1c007c02d2c4fae8665369d92971689fd2
Torne (Richard Coles) [Fri, 11 Oct 2013 16:23:14 +0000 (09:23 -0700)]
am
bb592343: am
8483e4f0: Merge "Add internal resource symbol used by WebViewChromium." into klp-dev
* commit '
bb5923433cdba892e714aa33cbf6525cbd53a17c':
Add internal resource symbol used by WebViewChromium.
Torne (Richard Coles) [Fri, 11 Oct 2013 16:20:39 +0000 (09:20 -0700)]
am
8483e4f0: Merge "Add internal resource symbol used by WebViewChromium." into klp-dev
* commit '
8483e4f007499d01901f73510b6b096f4e8b31bf':
Add internal resource symbol used by WebViewChromium.