drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
135,490 Commits 1 Branch 0 Tags
Commit Graph

329 Commits

Author SHA1 Message Date
Ed Heyl
2cf184233b merge master nova by hand, skipped translations 
Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb
 2014-05-14 13:24:53 -07:00
Baligh Uddin
bc3c9ec4ff Import translations. DO NOT MERGE 
Change-Id: I7d5f832b6c632d75c580cff1b30d7234c30d64a9
Auto-generated-cl: translation import
 2014-05-12 08:25:29 -07:00
Baligh Uddin
d7ee61112e Import translations. DO NOT MERGE 
Change-Id: I9c1fa79848e6ddb1190309328e3dd9a5636b3281
Auto-generated-cl: translation import
 2014-04-16 14:25:21 -07:00
Alan Viverette
01cefbc5b3 am b325345e: Merge "Switch framework Holo references to Quantum.Light" 
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
  Switch framework Holo references to Quantum.Light
 2014-04-02 22:23:17 +00:00
Alan Viverette
3a3395042e am b325345e: Merge "Switch framework Holo references to Quantum.Light" 
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
  Switch framework Holo references to Quantum.Light
 2014-04-02 22:18:59 +00:00
Alan Viverette
6259933ec9 Switch framework Holo references to Quantum.Light 
Change-Id: Ib545a143f1959b6104adbc9d594dd626851d90b3
 2014-04-01 14:57:39 -07:00
Baligh Uddin
456696ac98 Import translations. DO NOT MERGE 
Change-Id: I9d33cc058a79b8ea1b265104afbaa0dba76762a8
Auto-generated-cl: translation import
 2014-03-24 09:40:09 -07:00
Baligh Uddin
8b6d9fee1f Import translations. DO NOT MERGE 
Change-Id: Ic4396a06837a9e5c6f32ec9237567f886bdae8bd
Auto-generated-cl: translation import
 2014-03-19 09:41:29 -07:00
Geoff Mendal
554428c327 Import translations. DO NOT MERGE 
Change-Id: I997192f031eea02fbad2f41370db984dce84b65c
Auto-generated-cl: translation import
 2014-03-17 09:27:08 -07:00
Baligh Uddin
267bba6f64 Import translations. DO NOT MERGE 
Change-Id: Ia1ebb3566930294e42b3310a5d8ffa845852fa77
Auto-generated-cl: translation import
 2014-01-08 09:01:38 -08:00
Svetoslav
b0d97b87ba PrintSpooler crash if printer is reported to have only one color mode. 
bug:11993304

Change-Id: I4932cf1b5b9b89f0cbf97011782ede037e7d814c
 2014-01-06 18:00:54 -08:00
Svetoslav
2c1b177dcf Sometimes write may be called twice in a row for the same content. 
In a rare case it is possible that on write of a print document
adapter is called twice for the same pages with nothing being
changed. This happens if while doing a write we get an update
request which correctly avoids calling layout on the adapter
but does call on write as we ignore that we are waining for the
requested pages to be written. Fun.

Change-Id: I33d7d26c7c4b083dc7b66bf762697b6dafd1ccc4
 2013-12-20 17:10:49 -08:00
Baligh Uddin
38bae539f8 Remove deprecated locales 
Bug:11340849
Change-Id: Ib99486303927a6bce308b113d70f8e5b5bce4a13
 2013-12-09 22:41:12 +00:00
Dave Langemak
d487eb3c03 am 741c9c74: am d220d820: am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 
* commit '741c9c74ffead322c349242e3f72e8fd2957bd3d':
  Fix incorrent page range parsing when custom print options used.
 2013-11-19 08:43:18 -08:00
Dave Langemak
741c9c74ff am d220d820: am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 
* commit 'd220d8202e67a82075ee20351657509ca0885b67':
  Fix incorrent page range parsing when custom print options used.
 2013-11-19 08:38:55 -08:00
Dave Langemak
d220d8202e am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 
* commit 'c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1':
  Fix incorrent page range parsing when custom print options used.
 2013-11-19 08:34:57 -08:00
Dave Langemak
c04aa87e4a Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 2013-11-19 16:33:22 +00:00
Baligh Uddin
cff08b4cab Import translations. DO NOT MERGE 
Change-Id: I73cde7061a849fa76822f468ec79c7eb9021c9be
Auto-generated-cl: translation import
 2013-11-17 16:32:31 -08:00
Baligh Uddin
564fb1b8ce Import translations. DO NOT MERGE 
Change-Id: I6eea0f5a4b57c4686d1f6ff4fc137358400651b8
Auto-generated-cl: translation import
 2013-11-17 16:30:52 -08:00
Svetoslav Ganov
1a85d9fb24 Fix incorrent page range parsing when custom print options used. 
We have APIs for a print service to declare an activity with custom
print options. In this activity the service can add custom properties
as well as change the standard ones such as pages to print. The ranges
of selected pages from the custom activity was incorrectly parsed
resulting in an off by one error in what is shown to the user and as a
result getting an exception when trying to print.

bug:11719051

Change-Id: Id04c94608178895f1d47381a63133f0eba7645e1
 2013-11-15 21:52:35 -08:00
Baligh Uddin
5b3574a9aa Merge "Import translations. DO NOT MERGE" 2013-11-15 06:36:35 +00:00
Svetoslav
573f0db661 am 172c5a24: am d2b27cbd: am 6874bfe1: Merge "Created print jobs should not be persisted until they are queued." into klp-dev 
* commit '172c5a2473c82dfb72de289011fe615c28c572cd':
  Created print jobs should not be persisted until they are queued.
 2013-11-14 22:34:12 -08:00
Baligh Uddin
18658d1863 Import translations. DO NOT MERGE 
Change-Id: Ie93ca6d1a6baab26ef47fca55e5d3f27efb5997b
Auto-generated-cl: translation import
 2013-11-14 22:33:34 -08:00
Baligh Uddin
2785892dbf Import translations. DO NOT MERGE 
Change-Id: I6d1283da139ad2ef60213d83d7ac00939a4bfc04
Auto-generated-cl: translation import
 2013-11-14 22:32:08 -08:00
Svetoslav
172c5a2473 am d2b27cbd: am 6874bfe1: Merge "Created print jobs should not be persisted until they are queued." into klp-dev 
* commit 'd2b27cbde92dc57b5b6fe9b7434a5189a73dd2b2':
  Created print jobs should not be persisted until they are queued.
 2013-11-14 22:30:52 -08:00
Svetoslav
d2b27cbde9 am 6874bfe1: Merge "Created print jobs should not be persisted until they are queued." into klp-dev 
* commit '6874bfe19b6bc1522e07e53eb96a07e21d148b41':
  Created print jobs should not be persisted until they are queued.
 2013-11-14 22:27:35 -08:00
Svetoslav
885810de69 Created print jobs should not be persisted until they are queued. 
Print jobs in a created state should not be persisted. However,
if a print service sets the tag to a print job that is queued,
we were persisting even print jobs in a created state. This
change adds a simple check while persisting to avoid storing
created print jobs.

bug:11696785

Change-Id: Idf28f3634b91fd5bf345f376114af4ed478ed3c6
 2013-11-14 18:02:31 -08:00
Svetoslav
1b967a1b23 resolved conflicts for merge of 9358d98d to master 
Change-Id: I1facdcec6eeaa10805300c9d634957fbb86815d3
 2013-11-13 18:43:32 -08:00
Svetoslav Ganov
9358d98d83 am 852a8895: am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 
* commit '852a8895e18ad578a4c299d13615a4cbb3ee1211':
  Fix NPE at PrintSpooler in Japanese environment.
 2013-11-13 14:27:54 -08:00
Svetoslav Ganov
852a8895e1 am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 
* commit 'd697ba73b5a5fc5dc502a117a8f06e8f1a5359b9':
  Fix NPE at PrintSpooler in Japanese environment.
 2013-11-13 14:24:23 -08:00
Keiji Ariyama
1a8c7135f0 Fix NPE at PrintSpooler in Japanese environment. 
MediaSize ID have to be upper cases.

Change-Id: I84af01dbd185df210b5ebb1de282a4091e06df05
Related-issue: https://code.google.com/p/android/issues/detail?id=61984
 2013-11-13 11:43:26 -08:00
Baligh Uddin
de0bb5a097 Import translations. DO NOT MERGE 
Change-Id: I44ee60eb6a5bf5ec7099461ecf11930436a1fc05
Auto-generated-cl: translation import
 2013-11-11 08:12:59 -08:00
Baligh Uddin
9c530e1855 Import translations. DO NOT MERGE 
Change-Id: I75eb5e47f9851174f7bd7e8301537bf7c94a8b5a
Auto-generated-cl: translation import
 2013-11-11 08:11:33 -08:00
Baligh Uddin
6ccf625559 Import translations. DO NOT MERGE 
Change-Id: I659e58b641a7a154bca5ea33413aff6cde07635a
Auto-generated-cl: translation import
 2013-11-06 11:54:16 -08:00
Baligh Uddin
3b79bf493c Import translations. DO NOT MERGE 
Change-Id: I13dd4dfd6492c31975cd61e28caeea940a5f66cb
Auto-generated-cl: translation import
 2013-11-06 11:53:23 -08:00
Svetoslav
8045a50ed1 am 05d15b36: am 3976afb5: am c445b3f2: Merge "Add missing null pointer check in PrintSpoolerService." into klp-dev 
* commit '05d15b36bf133ac06c93e181c922d8119561ad5f':
  Add missing null pointer check in PrintSpoolerService.
 2013-11-05 14:22:45 -08:00
Svetoslav
b066a136d7 am d4879eec: am 628264c4: am 4033c94b: Merge "Add way for the user to forget previously used printers." into klp-dev 
* commit 'd4879eec5f1749d34d59a19ccde820c4eaabdfcf':
  Add way for the user to forget previously used printers.
 2013-11-05 14:22:41 -08:00
Svetoslav
05d15b36bf am 3976afb5: am c445b3f2: Merge "Add missing null pointer check in PrintSpoolerService." into klp-dev 
* commit '3976afb5ac2036864f8d75c26e144c5761c6b20c':
  Add missing null pointer check in PrintSpoolerService.
 2013-11-05 13:26:44 -08:00
Svetoslav
d4879eec5f am 628264c4: am 4033c94b: Merge "Add way for the user to forget previously used printers." into klp-dev 
* commit '628264c4f3828e0c4c997bb91f289a91d54c75c4':
  Add way for the user to forget previously used printers.
 2013-11-05 13:26:40 -08:00
Svetoslav
3976afb5ac am c445b3f2: Merge "Add missing null pointer check in PrintSpoolerService." into klp-dev 
* commit 'c445b3f2cba67b7dbb8f926ef5e80ec14fb2f8d4':
  Add missing null pointer check in PrintSpoolerService.
 2013-11-04 19:35:38 -08:00
Svetoslav
628264c4f3 am 4033c94b: Merge "Add way for the user to forget previously used printers." into klp-dev 
* commit '4033c94bb7566a652442ae1fa164d1efa7562761':
  Add way for the user to forget previously used printers.
 2013-11-04 19:35:35 -08:00
Svetoslav
c445b3f2cb Merge "Add missing null pointer check in PrintSpoolerService." into klp-dev 2013-11-05 03:33:37 +00:00
Svetoslav
75d28505c8 Add missing null pointer check in PrintSpoolerService. 
bug:11474389

Change-Id: I80ea01ba04ab71a212c1f78af62b377110ed072a
 2013-11-04 18:26:54 -08:00
Svetoslav
1c664b6def Add way for the user to forget previously used printers. 
We keep track of historical printers but some of them may disappear
forever, say the user changes his printer. In such a case the print
system has no idea that the previous printer will never appear so
this change allows the user to remove historical printers.

In the all printers list the user can now long press on a printer
and if the printer is available he can select it from the context
menu. If the printer was used before regardless if it is active the
user may choose to forget it.

bug:11282742

Change-Id: Idc2dda70920ad045149eea1bcfc75ad1992827e9
 2013-11-04 14:25:11 -08:00
Baligh Uddin
e63f9ded6b Merge "Import translations. DO NOT MERGE" 2013-11-01 14:34:45 +00:00
Baligh Uddin
2bc2574e60 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-01 14:34:40 +00:00
Svetoslav
7b4bb2f75e am 4379bd75: am eccfe65f: am 6ce161d1: Merge "Cancel current work in PrintDocumentAdatper if printing is cancelled." into klp-dev 
* commit '4379bd751877056ffa236d0eb8a6cf59b8732d2c':
  Cancel current work in PrintDocumentAdatper if printing is cancelled.
 2013-10-31 14:51:45 -07:00
Svetoslav
4379bd7518 am eccfe65f: am 6ce161d1: Merge "Cancel current work in PrintDocumentAdatper if printing is cancelled." into klp-dev 
* commit 'eccfe65f9daf459342ebc658b8a40584dfcea016':
  Cancel current work in PrintDocumentAdatper if printing is cancelled.
 2013-10-31 14:48:22 -07:00
Svetoslav
eccfe65f9d am 6ce161d1: Merge "Cancel current work in PrintDocumentAdatper if printing is cancelled." into klp-dev 
* commit '6ce161d1762a1c74b1ed6931c1d54f1f553267b0':
  Cancel current work in PrintDocumentAdatper if printing is cancelled.
 2013-10-31 14:44:50 -07:00
Svetoslav
d270cb9264 Cancel current work in PrintDocumentAdatper if printing is cancelled. 
Layout and write may take some time during which the user can
cancel printing. Currently we wait for the last operation,
being write or layout, to complete before closing the print
dialog. Now in such a scenario we request a cancellation of
the ongoing operation.

bug:11329523

Change-Id: Ia9d747163cc73509369a86c8b5afc83b7ee54859
 2013-10-31 14:30:58 -07:00