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

114440 Commits

Author SHA1 Message Date
Svetoslav
b450d0d4d7 Small print API tweaks 
1. Removed an unused public constant

2. Hide PrintFileDocumentAdapter which makes doing the wring
   thing easy.

3. We allow a print service to set a tag of a print job which is
   an arbitrary string it only knows how to interpret. Typically,
   this is the id of a remote print job. This tag was visible to
   applications which is wrong - this is data that should be
   private to the print service. Now the print service is the
   only one to see that.

bug:11084635

Change-Id: I763ea9ff0fdf647805bc36e1737d72263090714d
 2013-10-04 16:21:12 -07:00
Scott Main
332408f862 update version number for doc stamp 
Change-Id: I881510209a56204a464df082840d2dde56312303
 2013-10-04 16:17:50 -07:00
Eino-Ville Talvala
227c09f998 Fix build. 
Change-Id: I1c3537d936fd467014b966179f5ed2a8c6a696da
 2013-10-04 16:14:38 -07:00
Baligh Uddin
93f1b969a6 am bafa437f: (-s ours) am 29268255: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'bafa437ff51ed23204992c5cb29bb69fbc78a22c':
  Import translations. DO NOT MERGE
 2013-10-04 16:03:08 -07:00
Baligh Uddin
badfa7148a am 673b0fe2: (-s ours) am 15800b79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '673b0fe2820c9d00874386acc2aed3f9e847641d':
  Import translations. DO NOT MERGE
 2013-10-04 16:03:04 -07:00
Baligh Uddin
bafa437ff5 am 29268255: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '29268255078f05f2441311de94f903e18747e323':
  Import translations. DO NOT MERGE
 2013-10-04 16:00:41 -07:00
Baligh Uddin
da9e802f9c am 70d87e14: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '70d87e1408e9a94451b10da8ba0ddc11143b1050':
  Import translations. DO NOT MERGE
 2013-10-04 15:59:19 -07:00
Baligh Uddin
673b0fe282 am 15800b79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '15800b793b9cc0aa412b87a4dedd5770f583d1cf':
  Import translations. DO NOT MERGE
 2013-10-04 15:57:12 -07:00
Baligh Uddin
70d87e1408 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-04 22:55:43 +00:00
Baligh Uddin
2a2d9d2fc4 am 8084b108: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '8084b10887bc3a1d0de10e745c08dd7abf978c3d':
  Import translations. DO NOT MERGE
 2013-10-04 15:55:41 -07:00
Baligh Uddin
2926825507 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 22:55:38 +00:00
Baligh Uddin
8084b10887 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-04 22:53:10 +00:00
Baligh Uddin
15800b793b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 22:53:07 +00:00
Eino-Ville Talvala
eef7e31c2d am 079320a2: am 3f48f6aa: Merge "Camera2: Verbosity is verboten." into klp-dev 
* commit '079320a2adb2654c6aa008ae7f369c538434abfa':
  Camera2: Verbosity is verboten.
 2013-10-04 15:33:06 -07:00
Eino-Ville Talvala
079320a2ad am 3f48f6aa: Merge "Camera2: Verbosity is verboten." into klp-dev 
* commit '3f48f6aa6c3723a4143a4505520136d5b682a696':
  Camera2: Verbosity is verboten.
 2013-10-04 15:30:58 -07:00
Eino-Ville Talvala
3f48f6aa6c Merge "Camera2: Verbosity is verboten." into klp-dev 2013-10-04 22:27:59 +00:00
Chet Haase
280d250c70 am 956b23f4: am a0364e23: Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev 
* commit '956b23f4e3b9cac88ea4627bbe4783b165beec03':
  Fix infinite recursion in hashcode of Spannables
 2013-10-04 15:18:56 -07:00
Chet Haase
956b23f4e3 am a0364e23: Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev 
* commit 'a0364e23601db099b02fd280f91d2d3ecc2b0cc4':
  Fix infinite recursion in hashcode of Spannables
 2013-10-04 15:15:37 -07:00
Svetoslav Ganov
0d9ff1613a am 538df343: am 331f9e79: Merge "Print attributes hint not honored." into klp-dev 
* commit '538df3437b80d15b07cda2464b2ae4e5bae8219b':
  Print attributes hint not honored.
 2013-10-04 15:14:15 -07:00
Chet Haase
a0364e2360 Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev 2013-10-04 22:12:09 +00:00
Svetoslav Ganov
538df3437b am 331f9e79: Merge "Print attributes hint not honored." into klp-dev 
* commit '331f9e79ad16e7d9d51e8481e6bc21642a51c340':
  Print attributes hint not honored.
 2013-10-04 15:10:59 -07:00
Alan Viverette
6de0ee41f9 am 8d6730fd: am b89e969c: Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev 
* commit '8d6730fd30dd6aa4b186591f210dd5e74d117921':
  Fix font scaling issues in FastScroller and SubtitleView
 2013-10-04 15:10:19 -07:00
Jeff Sharkey
402401e666 am 2dcba613: am 5b491d63: Merge "Custom pressed states, fixed column sizes." into klp-dev 
* commit '2dcba613a736b1c0ba2f9c18c32f171f7bbb1a23':
  Custom pressed states, fixed column sizes.
 2013-10-04 15:10:16 -07:00
Raph Levien
a488c79605 am 2a32771a: am 24871f63: Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev 
* commit '2a32771ace5250ec919a08da688e2d6c91e5c132':
  Fix Text appears on top of existing text when composing in gmail.
 2013-10-04 15:10:13 -07:00
Svetoslav Ganov
331f9e79ad Merge "Print attributes hint not honored." into klp-dev 2013-10-04 22:08:25 +00:00
Alan Viverette
8d6730fd30 am b89e969c: Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev 
* commit 'b89e969cef91cc20499d955fd49286fde4a401e7':
  Fix font scaling issues in FastScroller and SubtitleView
 2013-10-04 15:07:15 -07:00
Jeff Sharkey
2dcba613a7 am 5b491d63: Merge "Custom pressed states, fixed column sizes." into klp-dev 
* commit '5b491d630b6628a3558cb1135ac1bc242eab3381':
  Custom pressed states, fixed column sizes.
 2013-10-04 15:07:13 -07:00
Raph Levien
2a32771ace am 24871f63: Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev 
* commit '24871f6375b87eb2d540f06ec292e5f4a198f78a':
  Fix Text appears on top of existing text when composing in gmail.
 2013-10-04 15:07:10 -07:00
Alan Viverette
b89e969cef Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev 2013-10-04 22:04:00 +00:00
Jeff Sharkey
5b491d630b Merge "Custom pressed states, fixed column sizes." into klp-dev 2013-10-04 22:03:43 +00:00
Raph Levien
24871f6375 Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev 2013-10-04 22:02:56 +00:00
Jeff Sharkey
43fac87f2a am 77b7f39f: am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 
* commit '77b7f39f512a34a9af0013cc7e01142192901d67':
  Avoid NPE when ProviderInfo is missing.
 2013-10-04 14:56:18 -07:00
Jeff Sharkey
77b7f39f51 am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 
* commit 'fc141ef20bf871e925fbbbe4bb9af64c67033246':
  Avoid NPE when ProviderInfo is missing.
 2013-10-04 14:52:24 -07:00
Jeff Sharkey
fc141ef20b Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 2013-10-04 21:49:07 +00:00
Jeff Sharkey
ca25db0cb3 Custom pressed states, fixed column sizes. 
Use custom pressed state assets.  Use fixed column sizes to prevent
truncating of long dates on small screens.

Also tear down any active CAB when switching fragments.

Bug: 11032418, 11028212
Change-Id: I2bf3dc3f693319b4b55cc901ed460f60faceba35
 2013-10-04 14:48:08 -07:00
Eino-Ville Talvala
51ca8d6bc0 Camera2: Verbosity is verboten. 
Bug: 10360518
Change-Id: I155effad61099535bee77cc0d0e380420d96770d
 2013-10-04 14:39:58 -07:00
Alex Ray
849ef427b8 am 2bbf0bfc: am 0ab7c883: Merge "Add Consumer IR feature" into klp-dev 
* commit '2bbf0bfc16358382589d56efcc0ea9e63807e941':
  Add Consumer IR feature
 2013-10-04 14:18:37 -07:00
Alex Ray
2bbf0bfc16 am 0ab7c883: Merge "Add Consumer IR feature" into klp-dev 
* commit '0ab7c883d51288f62ba605d5a797abd71ad68626':
  Add Consumer IR feature
 2013-10-04 14:16:21 -07:00
Alex Ray
0ab7c883d5 Merge "Add Consumer IR feature" into klp-dev 2013-10-04 21:13:35 +00:00
Chet Haase
aa00613322 Enable transitions in lockscreen media controller 
Media controller now fades between different states. The code for
doing this was already there, but this CL enables them and changes
the behavior of transition's OnPreDrawListener to do the right thing.

Also, this CL fixes a bug in ChangeText found while testing this change.

Issue  ChangeText transition crashes when KEEP transition type used

Change-Id: I5e04c28e1b5faac017b0a4e49734d9faa7fe79cd
 2013-10-04 14:05:48 -07:00
Jeff Sharkey
9095c5a823 Avoid NPE when ProviderInfo is missing. 
Bug: 11052428
Change-Id: I6cb0cf2030a28f571c3f13cd0b9ba76627974697
 2013-10-04 13:53:50 -07:00
Scott Main
2cf2948dbf am 3f90705a: am 795b6e42: Merge "add -since flag for api level 19 to filter javadocs" into klp-dev 
* commit '3f90705a47aea93fb83f51e5c181fbfe6aabd618':
  add -since flag for api level 19 to filter javadocs
 2013-10-04 13:49:24 -07:00
Scott Main
3f90705a47 am 795b6e42: Merge "add -since flag for api level 19 to filter javadocs" into klp-dev 
* commit '795b6e42c8d6953a44a3ea57c880aa5a2b890426':
  add -since flag for api level 19 to filter javadocs
 2013-10-04 13:44:59 -07:00
Scott Main
795b6e42c8 Merge "add -since flag for api level 19 to filter javadocs" into klp-dev 2013-10-04 20:41:09 +00:00
Baligh Uddin
8ff7fa4836 am bf99468a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'bf99468ae8dadd8b933e64c3fc35f7475395d74f':
  Import translations. DO NOT MERGE
 2013-10-04 13:34:38 -07:00
Baligh Uddin
7b6cdc5d8d am f343fbd8: (-s ours) am af0c8bfb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f343fbd82a1be8df45afb91bd8c9af7ea736c0ed':
  Import translations. DO NOT MERGE
 2013-10-04 13:34:28 -07:00
Robert Greenwalt
72566b98db am 1c6fdd6c: am cac2fd30: Merge "Revert "Use a build-specific wifi country code"" into klp-dev 
* commit '1c6fdd6c7b58b7f25d49fd26a29a03a478cc5937':
  Revert "Use a build-specific wifi country code"
 2013-10-04 13:34:22 -07:00
Baligh Uddin
6394e1e0d9 am ba78a70c: (-s ours) am 548622a2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ba78a70c1d3bb5d135d3233d5479f41ed7183b0b':
  Import translations. DO NOT MERGE
 2013-10-04 13:34:19 -07:00
Baligh Uddin
783b4c7c44 am 626bbd23: (-s ours) am 5b40f4fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '626bbd23cf3476af5b52779504a41f36cfc0026b':
  Import translations. DO NOT MERGE
 2013-10-04 13:34:13 -07:00
Baligh Uddin
338cb79cbc am e5449a3b: (-s ours) am eba7c748: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e5449a3b44de1b0245ecf7edd4989b5bef005493':
  Import translations. DO NOT MERGE
 2013-10-04 13:34:11 -07:00