Svetoslav
c19c3c8d04
am c7f18b52: am 099d842b: Update javadoc to fix the build.
...
* commit 'c7f18b526f2029e78ea609db688854439e180d31':
Update javadoc to fix the build.
2013-10-28 16:39:41 -07:00
Svetoslav
c7f18b526f
am 099d842b: Update javadoc to fix the build.
...
* commit '099d842bdac481ea94527ab1f702342e41dca440':
Update javadoc to fix the build.
2013-10-28 16:34:55 -07:00
Svetoslav
099d842bda
Update javadoc to fix the build.
...
Change-Id: Ib6e8c17f10a7f17785876681baf8fb07eac9af55
2013-10-28 15:56:48 -07:00
Svetoslav
0298ebb2db
am 60fb1e28: am 714ba345: Merge "Complete implementation of the advanced print options." into klp-dev
...
* commit '60fb1e28375b9c0dc7505214f3ab33bdd38f7aa8':
Complete implementation of the advanced print options.
2013-10-28 15:12:26 -07:00
Svetoslav
60fb1e2837
am 714ba345: Merge "Complete implementation of the advanced print options." into klp-dev
...
* commit '714ba34556572d36b1f9f8d9b860c4da24da6361':
Complete implementation of the advanced print options.
2013-10-28 15:09:12 -07:00
Svetoslav
714ba34556
Merge "Complete implementation of the advanced print options." into klp-dev
2013-10-28 22:07:03 +00:00
Lajos Molnar
f57530e449
am fcd69ca4: am 66b753b0: Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev
...
* commit 'fcd69ca4cc1fb9f1f837afc8cf5aece9520aaded':
MediaPlayer: MTP: update state only based on source events
2013-10-28 15:05:50 -07:00
Dianne Hackborn
a03fc2c296
am 1c18c5d4: am 3a702cb5: Merge "Fix issue #11391003 : Allow dumpsys meminfo to be used with native processes" into klp-dev
...
* commit '1c18c5d40ce7004d28aaa8f6c6713efcc72e6706':
Fix issue #11391003 : Allow dumpsys meminfo to be used with native processes
2013-10-28 15:05:46 -07:00
Lajos Molnar
fcd69ca4cc
am 66b753b0: Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev
...
* commit '66b753b06bb265d3f5b25244856f8d827a9dc5af':
MediaPlayer: MTP: update state only based on source events
2013-10-28 15:02:35 -07:00
Dianne Hackborn
1c18c5d40c
am 3a702cb5: Merge "Fix issue #11391003 : Allow dumpsys meminfo to be used with native processes" into klp-dev
...
* commit '3a702cb5d7eac0d8504c67145dded5d45a9c1027':
Fix issue #11391003 : Allow dumpsys meminfo to be used with native processes
2013-10-28 15:02:32 -07:00
Lajos Molnar
66b753b06b
Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev
2013-10-28 21:59:55 +00:00
Dianne Hackborn
3a702cb5d7
Merge "Fix issue #11391003 : Allow dumpsys meminfo to be used with native processes" into klp-dev
2013-10-28 21:59:18 +00:00
Baligh Uddin
6639f73471
am 51ef6f68: (-s ours) am 170735d4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '51ef6f688a0aaf7f0ee201096bac58381bcb9f20':
Import translations. DO NOT MERGE
2013-10-28 12:44:03 -07:00
Baligh Uddin
c7d7e07197
am 24c97e4c: (-s ours) am c98c6cc6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '24c97e4c66fdc4086e6dbe362193188698716262':
Import translations. DO NOT MERGE
2013-10-28 12:44:00 -07:00
Baligh Uddin
04cebc99c2
am 53ffdcc0: (-s ours) am 9b16d131: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '53ffdcc0aac3a61e3b28f264127f5c2ca273998a':
Import translations. DO NOT MERGE
2013-10-28 12:43:57 -07:00
Baligh Uddin
51ef6f688a
am 170735d4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '170735d46001659e64522f451681a0618685efc6':
Import translations. DO NOT MERGE
2013-10-28 12:37:55 -07:00
Baligh Uddin
24c97e4c66
am c98c6cc6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'c98c6cc64916e57010e005902dbd304a6c811f95':
Import translations. DO NOT MERGE
2013-10-28 12:37:51 -07:00
Baligh Uddin
53ffdcc0aa
am 9b16d131: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '9b16d1313fc1c81e356c0dcb39d0bf8f67b90161':
Import translations. DO NOT MERGE
2013-10-28 12:37:48 -07:00
Baligh Uddin
170735d460
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-28 19:34:13 +00:00
Baligh Uddin
c98c6cc649
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-28 19:33:46 +00:00
Baligh Uddin
9b16d1313f
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-28 19:33:31 +00:00
Svetoslav
b4fda13476
Complete implementation of the advanced print options.
...
1. Implemented the advanced printer options integration. Now a print service
may declare an advanced print options activity which may be launched by
the user if the current printer supports advanced print options. These options
are visible only to the print service that added them and it is the only party
that will interpret the options.
2. Fixed a couple of bugs in the saved print jobs parsing. One was that if there
are more than one page range, a half of the print job properties was not
properly parsed. The other was that the media size constructor was using
incorrect argument order, thus creating a media size with wring width.
3. Fixed and edge case where old print jobs and their docs can get stuck in
the spooler. If the app did not write the requested pages we were not showing
an error message, rather just finish the activity without canceling the print
job and this print job is stuck in the spooler. Now we show an error message
and the user may retry, cancel. If the user cancels the print job is also
cancelled, thus no leftover in the spooler.
4. Fixed the background color of the print dialog to meet UX spec.
bug:11241800
Change-Id: I352440bc86aec824a805883fc9579d96a06d11e6
2013-10-28 11:44:07 -07:00
Christopher Tate
16e8588664
am e5f477ff: am ad7c57db: Merge "Always re-evaluate kernel alarm setpoints when a new alarm is added" into klp-dev
...
* commit 'e5f477fff50dd121f8fc3dc3cfe1ba83088d04b0':
Always re-evaluate kernel alarm setpoints when a new alarm is added
2013-10-28 11:20:24 -07:00
Christopher Tate
e5f477fff5
am ad7c57db: Merge "Always re-evaluate kernel alarm setpoints when a new alarm is added" into klp-dev
...
* commit 'ad7c57db25ac4fc919a92a215ec2a4609c0f91a9':
Always re-evaluate kernel alarm setpoints when a new alarm is added
2013-10-28 11:18:21 -07:00
Christopher Tate
ad7c57db25
Merge "Always re-evaluate kernel alarm setpoints when a new alarm is added" into klp-dev
2013-10-28 18:16:27 +00:00
Baligh Uddin
97ea6a0648
Import translations. DO NOT MERGE
...
Change-Id: I1ef363e676ff75e85aece9789cdb7c86b55281d3
Auto-generated-cl: translation import
2013-10-28 10:45:56 -07:00
Christopher Tate
7d57ed88c9
Always re-evaluate kernel alarm setpoints when a new alarm is added
...
...even if the new one is later than some other existing alarms.
Bug 11392699
Change-Id: I80dccd76300acb4729f0337665b91e897a770571
2013-10-28 10:34:54 -07:00
Vineeta Srivastava
e1b16b09d0
am ccf1a88d: am 2ead7510: Merge "Do not show roaming icon for Videotron operator when access Canada network" into klp-dev
...
* commit 'ccf1a88daf17726a72d643439bc8b7456c1bed92':
Do not show roaming icon for Videotron operator when access Canada network
2013-10-28 09:57:23 -07:00
Jeff Sharkey
e643e33736
am 99dcb2eb: am 10e509dc: Merge "Use inotify to update DocumentsUI." into klp-dev
...
* commit '99dcb2eb3578c3d14658b3850cb3e32608e173b1':
Use inotify to update DocumentsUI.
2013-10-28 09:57:20 -07:00
Vineeta Srivastava
ccf1a88daf
am 2ead7510: Merge "Do not show roaming icon for Videotron operator when access Canada network" into klp-dev
...
* commit '2ead75109cf21223b7754fc3906c86d2fbd145cb':
Do not show roaming icon for Videotron operator when access Canada network
2013-10-28 09:51:27 -07:00
Vineeta Srivastava
2ead75109c
Merge "Do not show roaming icon for Videotron operator when access Canada network" into klp-dev
2013-10-28 16:48:53 +00:00
Baligh Uddin
55e168f544
Import translations. DO NOT MERGE
...
Change-Id: Ic80d15c427e2f67465a6c45ab08d0ffcb618ae62
Auto-generated-cl: translation import
2013-10-28 09:47:23 -07:00
Baligh Uddin
4aef4ca530
Import translations. DO NOT MERGE
...
Change-Id: I74c7510762c6c2591784ea2997695449f8aa2e53
Auto-generated-cl: translation import
2013-10-28 09:19:49 -07:00
Lajos Molnar
4de8e7c1a5
MediaPlayer: MTP: update state only based on source events
...
State only depends on events from the MediaPlayer (this includes
the pseudo-event from MTP recovery mechanism.)
Change-Id: Idd62a773d2386ad6bfbfe417412c2e2ff09b3600
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11412881
2013-10-28 09:19:26 -07:00
Jeff Sharkey
99dcb2eb35
am 10e509dc: Merge "Use inotify to update DocumentsUI." into klp-dev
...
* commit '10e509dcc20da34b79bc4616cc795a3720ddad49':
Use inotify to update DocumentsUI.
2013-10-28 09:14:37 -07:00
Jeff Sharkey
10e509dcc2
Merge "Use inotify to update DocumentsUI." into klp-dev
2013-10-28 16:12:16 +00:00
Sungmin Choi
119e24f987
Do not show roaming icon for Videotron operator when access Canada network
...
Bug: 11260638
Change-Id: I70b3c2c190707b41ca04110851b7c9581d1c196f
2013-10-28 09:11:36 -07:00
Craig Mautner
f65dd21390
am 2534c16b: am dfe0d9a0: Merge "Change order of operations so flag is not overwritten" into klp-dev
...
* commit '2534c16b44922e19e040a999cd99b412674e63a1':
Change order of operations so flag is not overwritten
2013-10-28 07:44:08 -07:00
Craig Mautner
2534c16b44
am dfe0d9a0: Merge "Change order of operations so flag is not overwritten" into klp-dev
...
* commit 'dfe0d9a040707c72aab20c54718d0b5f1bab56ff':
Change order of operations so flag is not overwritten
2013-10-28 07:40:47 -07:00
Craig Mautner
dfe0d9a040
Merge "Change order of operations so flag is not overwritten" into klp-dev
2013-10-28 14:38:32 +00:00
Siva Velusamy
5894e7378b
am 09675799: am 334d98f1: am 9e4514cd: am 4062ae2e: am 3ebe71cb: Update AS download page for v0.3.1
...
* commit '09675799a01d920c58ea1393eaae4756d211215c':
Update AS download page for v0.3.1
2013-10-25 18:48:42 -07:00
Siva Velusamy
09675799a0
am 334d98f1: am 9e4514cd: am 4062ae2e: am 3ebe71cb: Update AS download page for v0.3.1
...
* commit '334d98f1ece949414b94924a5bc852810e0bf367':
Update AS download page for v0.3.1
2013-10-25 18:46:14 -07:00
Siva Velusamy
334d98f1ec
am 9e4514cd: am 4062ae2e: am 3ebe71cb: Update AS download page for v0.3.1
...
* commit '9e4514cd06592dc5cc81638699dc9d17065d42d2':
Update AS download page for v0.3.1
2013-10-25 18:42:42 -07:00
Siva Velusamy
9e4514cd06
am 4062ae2e: am 3ebe71cb: Update AS download page for v0.3.1
...
* commit '4062ae2ef958b009e8c2850ad249e45df1d476aa':
Update AS download page for v0.3.1
2013-10-25 18:40:40 -07:00
Siva Velusamy
4062ae2ef9
am 3ebe71cb: Update AS download page for v0.3.1
...
* commit '3ebe71cb933d99461dfb3702fb4977f966df3713':
Update AS download page for v0.3.1
2013-10-25 18:37:35 -07:00
Christopher Tate
13c4645bfc
am f7d74870: am 6364c26c: Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev
...
* commit 'f7d74870db6f8b1275d4b93268b0210e351647b3':
Un-deprecate setInexactRepeating() and tweak docs
2013-10-25 18:17:56 -07:00
Jeff Sharkey
de9b66fee1
am 3ac436b7: am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev
...
* commit '3ac436b758830eb938c62d5ed91caa7808b5b63e':
Extra to always show advanced devices.
2013-10-25 18:17:52 -07:00
Christopher Tate
f7d74870db
am 6364c26c: Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev
...
* commit '6364c26cb385ea654b7c8af8a1ef2f5cb4a556c2':
Un-deprecate setInexactRepeating() and tweak docs
2013-10-25 18:13:36 -07:00
Jeff Sharkey
3ac436b758
am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev
...
* commit '80f103ae12c4eb90fc2e06a6921dde2f092a181b':
Extra to always show advanced devices.
2013-10-25 18:13:33 -07:00
Jeff Sharkey
db5ef12500
Use inotify to update DocumentsUI.
...
While user is actively looking at a directory, subscribe to inotify
events and notify of content changes to trigger requeries. Reference
count the observers, since multiple cursors are regularly open during
requeries.
Fix leaking cursors on activity rotation; crazy loader ID generation
is no longer needed.
Bug: 10999396
Change-Id: Iddeb08a056fee80c93df8499874705bcd213a1e2
2013-10-25 17:51:04 -07:00