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

116072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Lease
28ff40405d am e8200873: am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev 
* commit 'e8200873598cf872062126b86edd933620f594aa':
  reset mShapingPaint's SkTypeface before we use it
 2013-10-04 18:04:57 -07:00
Victoria Lease
e820087359 am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev 
* commit '0d5a719dc7f2ca8726f670af3c5b9fdee614ab07':
  reset mShapingPaint's SkTypeface before we use it
 2013-10-04 18:01:45 -07:00
Victoria Lease
0d5a719dc7 am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev 
* commit 'b088c9e0dd2d66a181b9cfbf7f9ba8e27bde0922':
  reset mShapingPaint's SkTypeface before we use it
 2013-10-04 17:58:48 -07:00
Victoria Lease
b088c9e0dd Merge "reset mShapingPaint's SkTypeface before we use it" into klp-dev 2013-10-05 00:55:52 +00:00
Svetoslav
6754f68f49 am 133c1faf: am 67d7af51: am 19565ad1: Merge "Small print API tweaks" into klp-dev 
* commit '133c1faf8c4450c5ad45dea13323d45dfb60817b':
  Small print API tweaks
 2013-10-04 17:37:21 -07:00
Jim Miller
7dc10595e5 am bb93ee73: am d479396d: am ed887bff: Merge "Replace searchlight asset with new new asset" into klp-dev 
* commit 'bb93ee731c7056769b10371caf0be7a12c6db78c':
  Replace searchlight asset with new new asset
 2013-10-04 17:37:18 -07:00
Chet Haase
b0891e66b4 am 5c44b36b: am 3980ae47: am 845d9192: Merge "Enable transitions in lockscreen media controller" into klp-dev 
* commit '5c44b36b2a5f44bdba53244ee423aeeea14c485e':
  Enable transitions in lockscreen media controller
 2013-10-04 17:37:11 -07:00
Eino-Ville Talvala
fb205d1096 am 3afc7f15: am 9edb7741: am 4c76fdd8: Merge "Fix build." into klp-dev 
* commit '3afc7f15c66563c7c966ff44f2a385779678e547':
  Fix build.
 2013-10-04 17:37:07 -07:00
Scott Main
f99ec85e4f am 856441e7: am 920de6c6: am 332408f8: update version number for doc stamp 
* commit '856441e72fa6a79a5421e9538e5af17df281eaab':
  update version number for doc stamp
 2013-10-04 17:37:02 -07:00
Baligh Uddin
53a3f2c2fb am 93f1b969: (-s ours) am bafa437f: (-s ours) am 29268255: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '93f1b969a63c3259f60be81ac3e664606b299267':
  Import translations. DO NOT MERGE
 2013-10-04 17:36:52 -07:00
Baligh Uddin
1dd5738d41 am badfa714: (-s ours) am 673b0fe2: (-s ours) am 15800b79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'badfa7148acdd061e1eaca850562e2b85a261c12':
  Import translations. DO NOT MERGE
 2013-10-04 17:36:49 -07:00
Baligh Uddin
fd49eff79b am da9e802f: (-s ours) am 70d87e14: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'da9e802f9c71fca80a35d5faad62804913c63bec':
  Import translations. DO NOT MERGE
 2013-10-04 17:36:44 -07:00
Baligh Uddin
7a064a1fbc am 2a2d9d2f: (-s ours) am 8084b108: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '2a2d9d2fc4c94b619e82554aeca326d58faf6539':
  Import translations. DO NOT MERGE
 2013-10-04 17:36:41 -07:00
Eino-Ville Talvala
13613231c2 am eef7e31c: am 079320a2: am 3f48f6aa: Merge "Camera2: Verbosity is verboten." into klp-dev 
* commit 'eef7e31c2db116f7064ffd991c670f8b798fad31':
  Camera2: Verbosity is verboten.
 2013-10-04 17:36:32 -07:00
Chet Haase
e986ffa887 am 280d250c: am 956b23f4: am a0364e23: Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev 
* commit '280d250c70db2c096f3639307235a4d62f0ca38f':
  Fix infinite recursion in hashcode of Spannables
 2013-10-04 17:36:25 -07:00
Svetoslav Ganov
2829955b6c am 0d9ff161: am 538df343: am 331f9e79: Merge "Print attributes hint not honored." into klp-dev 
* commit '0d9ff1613a290a0c9b197a099c898ccc9cc5f60c':
  Print attributes hint not honored.
 2013-10-04 17:36:21 -07:00
Alan Viverette
14b875b09b am 6de0ee41: am 8d6730fd: am b89e969c: Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev 
* commit '6de0ee41f9a9668180368d82da688793cef9489d':
  Fix font scaling issues in FastScroller and SubtitleView
 2013-10-04 17:36:17 -07:00
Jeff Sharkey
43c0dd7f20 am 402401e6: am 2dcba613: am 5b491d63: Merge "Custom pressed states, fixed column sizes." into klp-dev 
* commit '402401e666b0b5068ebcb0e45d0ed9c06dd4674e':
  Custom pressed states, fixed column sizes.
 2013-10-04 17:36:13 -07:00
Raph Levien
d0607035e3 am a488c796: am 2a32771a: am 24871f63: Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev 
* commit 'a488c79605d0629986bb636bc2a2bc86f4947686':
  Fix Text appears on top of existing text when composing in gmail.
 2013-10-04 17:36:08 -07:00
Jeff Sharkey
0841c51696 am 43fac87f: am 77b7f39f: am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 
* commit '43fac87f2a8f4843614a5784b830801a90f30150':
  Avoid NPE when ProviderInfo is missing.
 2013-10-04 17:35:54 -07:00
Victoria Lease
8450a6ef8b reset mShapingPaint's SkTypeface before we use it 
Harfbuzz works in TTF glyph-space, but most of Skia works in
fallback glyph-space. shapeFontRun() helpfully calculates the
baseGlyphCount needed to convert between the two, but leaves
mShapingPaint's SkTypeface set to the specific TTF being shaped
rather than the original SkTypeface that was requested. Needless
to say, this causes all manner of horrific malady when glyph
indices are calculated in one glyph-index-space and then applied
to another.

To fix this issue, I reset mShapingPaint's SkTypeface when done
with the Harfbuzz shaping operation so that the baseGlyphCount only
gets applied once.

Change-Id: Ia886f89d667634e15e5fc8d7af443c9d1ba89622
 2013-10-04 17:33:35 -07:00
Svetoslav
133c1faf8c am 67d7af51: am 19565ad1: Merge "Small print API tweaks" into klp-dev 
* commit '67d7af514c2a393cbe886ebf5527a0dc45817cfb':
  Small print API tweaks
 2013-10-04 16:51:58 -07:00
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
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
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
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
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
Michael Wright
1ec1d55633 Merge "Change WallpaperManagerService TAG to match class name" 2013-10-04 23:06:51 +00: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
2dbc82fd6f Merge "Import translations. DO NOT MERGE" 2013-10-04 22:55:47 +00: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
7fc78b3e85 Merge "Import translations. DO NOT MERGE" 2013-10-04 22:53:14 +00:00