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

114871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
bb93ee731c am d479396d: am ed887bff: Merge "Replace searchlight asset with new new asset" into klp-dev 
* commit 'd479396d2d3cc6470c5774863827ccc9cb3133e1':
  Replace searchlight asset with new new asset
 2013-10-04 16:51:52 -07:00
Svetoslav
67d7af514c am 19565ad1: Merge "Small print API tweaks" into klp-dev 
* commit '19565ad1a19bf8e400d04a3a64cf6455ddca81ca':
  Small print API tweaks
 2013-10-04 16:49:58 -07:00
Jim Miller
d479396d2d am ed887bff: Merge "Replace searchlight asset with new new asset" into klp-dev 
* commit 'ed887bff6e3ae0aee562022135e3d927a327bd2a':
  Replace searchlight asset with new new asset
 2013-10-04 16:49:55 -07:00
Svetoslav
19565ad1a1 Merge "Small print API tweaks" into klp-dev 2013-10-04 23:48:37 +00:00
Jim Miller
ed887bff6e Merge "Replace searchlight asset with new new asset" into klp-dev 2013-10-04 23:48:24 +00:00
Dianne Hackborn
9844d299af Fix issue #11050678: Large memory leak in ActivityStack 
Clear thumbnails from tasks that are removed from the recent tasks list.

Change-Id: I581d5baac9b5a3e046a654eb8448ff877dd2f120
 2013-10-04 16:44:22 -07:00
Jim Miller
93cc6106be Replace searchlight asset with new new asset 
Fixes bug 11030712

Change-Id: I8361c74e344ec3f9c7176635face84af2d754973
 2013-10-04 16:41:34 -07:00
Chet Haase
5c44b36b2a am 3980ae47: am 845d9192: Merge "Enable transitions in lockscreen media controller" into klp-dev 
* commit '3980ae478b290bc472f20289b67b6719439b12fa':
  Enable transitions in lockscreen media controller
 2013-10-04 16:34:14 -07:00
Chet Haase
3980ae478b am 845d9192: Merge "Enable transitions in lockscreen media controller" into klp-dev 
* commit '845d9192d7bc822f3c3dc30643d66f7d66249566':
  Enable transitions in lockscreen media controller
 2013-10-04 16:30:22 -07:00
Eino-Ville Talvala
3afc7f15c6 am 9edb7741: am 4c76fdd8: Merge "Fix build." into klp-dev 
* commit '9edb77412e2f82540627c993f9ddf024726cc386':
  Fix build.
 2013-10-04 16:30:22 -07:00
Eino-Ville Talvala
9edb77412e am 4c76fdd8: Merge "Fix build." into klp-dev 
* commit '4c76fdd8f213f4aa37a58b3d6f625c6d4269f619':
  Fix build.
 2013-10-04 16:26:43 -07:00
Scott Main
856441e72f am 920de6c6: am 332408f8: update version number for doc stamp 
* commit '920de6c63270e4879c6249bf8c87e1ca2d248931':
  update version number for doc stamp
 2013-10-04 16:26:41 -07:00
Chet Haase
845d9192d7 Merge "Enable transitions in lockscreen media controller" into klp-dev 2013-10-04 23:26:37 +00:00
Scott Main
920de6c632 am 332408f8: update version number for doc stamp 
* commit '332408f86290bc02090d69f3a4b08ed959d93b62':
  update version number for doc stamp
 2013-10-04 16:23:16 -07:00
Eino-Ville Talvala
4c76fdd8f2 Merge "Fix build." into klp-dev 2013-10-04 23:21:55 +00:00
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
Adam Lesinski
2b8e82fd51 AAPT emits error for res with no 'default' product 
Rather than ignoring resources that do not match the specified
product, we keep track of the ignored ones and make sure that
some variant of the resource that matches the product was processed.

bug:10860838
Change-Id: I804cd04a053269a35b7e1c1cc743b77493337bf9
 2013-10-04 15:14:09 -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