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

120383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
2f538df392 Merge "Import translations. DO NOT MERGE" 2013-11-18 18:50:30 +00:00
Robert Greenwalt
66c8513423 am 51213d94: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev 
* commit '51213d943b3931434cbd196a8a159ee325a4e3fc':
  Fix NPE in ConnectivityService
 2013-11-18 10:37:51 -08:00
Robert Greenwalt
51213d943b am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev 
* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
  Fix NPE in ConnectivityService
 2013-11-18 10:33:46 -08:00
Raph Levien
a033630e80 Initial integration of Minikin to framework 
With this patch, framework does at least some of its text rendering
using Minikin instead of TextLayoutCache. There's a lot of stuff broken
and not yet implemented, but the phone will boot.

Changes are hidden behind USE_MINIKIN, which should be set in
BoardConfig.mk for the brave. Without that, there are changes to
signatures in JNI methods and so on, but shouldn't be any visible
changes.

This commit also introduces a new abstraction for Typeface:

The new TypefaceImpl abstraction represents the functionality that
corresponds to a Java Typeface object. Currently it is backed by
SkTypeface, but in the migration to Minikin it is a FontCollection
combined with a FontStyle. This patch introduces a USE_MINIKIN
preprocessor switch, so there is no substantial change to existing
Skia-based code, but which lets us start replacing the implementation
with the Minikin version.

Change-Id: I532c4c2d32d4f4c1f349dc1db37caa112af587ea
 2013-11-18 10:32:20 -08:00
Robert Greenwalt
a8a448da25 am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev 
* commit 'e568672c9e57e1d7066e95ba547a1ae568409226':
  Fix NPE in ConnectivityService
 2013-11-18 10:29:51 -08:00
Robert Greenwalt
e568672c9e Merge "Fix NPE in ConnectivityService" into klp-dev 2013-11-18 18:27:23 +00:00
Deepanshu Gupta
0baec410c2 Update ICU_Delegate methods. DO NOT MERGE 
Bug: 11435966
Change-Id: Ib8ed2011fe62b2496795075b33b9ca7d5907b87a
 2013-11-18 10:20:37 -08:00
Deepanshu Gupta
c94ef4716a am 5b950250: (-s ours) am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev 
* commit '5b95025059f0925ad8d11bf503eb2acb4cc63228':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE
 2013-11-18 10:19:42 -08:00
Deepanshu Gupta
c518249a0c am f6ee0805: (-s ours) am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev 
* commit 'f6ee0805706531ee0e899778a16bec71b5f18ce5':
  Fix NPE in layoutlib. DO NOT MERGE
 2013-11-18 10:19:39 -08:00
Deepanshu Gupta
5b95025059 am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev 
* commit 'ea04da7a183b526cdc79366822e4fc794d28cbd2':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE
 2013-11-18 10:15:44 -08:00
Deepanshu Gupta
f6ee080570 am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev 
* commit '42453ede3335aa5f7007a5b36749e84df83a08d4':
  Fix NPE in layoutlib. DO NOT MERGE
 2013-11-18 10:15:40 -08:00
Deepanshu Gupta
ea04da7a18 am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev 
* commit '9570ed561296dd5a0753198706cde152b00f1b24':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE
 2013-11-18 10:11:50 -08:00
Deepanshu Gupta
42453ede33 am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev 
* commit '599105a92ceb24f0f09beb11be18126ae4e8efdf':
  Fix NPE in layoutlib. DO NOT MERGE
 2013-11-18 10:11:47 -08:00
Deepanshu Gupta
9570ed5612 Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev 2013-11-18 18:08:09 +00:00
Deepanshu Gupta
599105a92c Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev 2013-11-18 18:07:55 +00:00
Robert Greenwalt
a8dae99d76 Fix NPE in ConnectivityService 
bug:11727708
Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a
 2013-11-18 09:43:59 -08:00
Baligh Uddin
46db123752 Import translations. DO NOT MERGE 
Change-Id: Idd62c4355924b8dcf819525e688124d9ac3151f8
Auto-generated-cl: translation import
 2013-11-18 09:25:17 -08:00
Baligh Uddin
4f0d1fc028 Import translations. DO NOT MERGE 
Change-Id: Iacdab3a03a17cefc52aa7d72195d0cbcc2354039
Auto-generated-cl: translation import
 2013-11-18 09:22:29 -08:00
Baligh Uddin
63c7ca496d Import translations. DO NOT MERGE 
Change-Id: I237e581fd77ba1c3eca79d60905916135109acec
Auto-generated-cl: translation import
 2013-11-18 09:17:04 -08:00
Baligh Uddin
2337eb1b65 Import translations. DO NOT MERGE 
Change-Id: Ia6d256fedf7e3d888942d66397f5842d46658c0f
Auto-generated-cl: translation import
 2013-11-18 08:49:48 -08:00
Baligh Uddin
9ef0c9a6d4 Import translations. DO NOT MERGE 
Change-Id: Ieb92529f59f8f2d834e11ff6eb97adb7336dabfa
Auto-generated-cl: translation import
 2013-11-18 08:40:16 -08:00
Baligh Uddin
4be55a0eac am ce21c69b: (-s ours) am 253a352f: (-s ours) am 564fb1b8: (-s ours) Import translations. DO NOT MERGE 
* commit 'ce21c69b2a926c5ad22b8178e6c02c040309a827':
  Import translations. DO NOT MERGE
 2013-11-17 16:43:07 -08:00
Baligh Uddin
ce21c69b2a am 253a352f: (-s ours) am 564fb1b8: (-s ours) Import translations. DO NOT MERGE 
* commit '253a352f8c351201781fe5e677ddc588b3527a95':
  Import translations. DO NOT MERGE
 2013-11-17 16:38:53 -08:00
Baligh Uddin
253a352f8c am 564fb1b8: (-s ours) Import translations. DO NOT MERGE 
* commit '564fb1b8ce4aa603bd0d5b3a077ba27d66e77c32':
  Import translations. DO NOT MERGE
 2013-11-17 16:35:05 -08: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
Dirk Dougherty
241a327afe Add link to HCE dev guide. 
Change-Id: I452a59ff81d0e0e34cb6802acfc539fa1219bd68
 2013-11-15 21:32:50 -08:00
Amith Yamasani
b6fda0962e Don't freak out if SystemUiService isn't available 
Reducing dependencies on system services

Change-Id: Ida3c5cc034290bdea701d9e6a33706414b667f97
 2013-11-15 16:52:16 -08:00
Alan Viverette
cac68c3f64 Merge "Deprecate Activity.setTitleColor()" 2013-11-15 23:47:53 +00:00
Craig Mautner
47fef37d8a am 427dcdff: am 0324bb1a: am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev 
* commit '427dcdffc2a61c2eb2760337771be05d14beb0a1':
  Restore jankless transition keyguard-to-wallpaper
 2013-11-15 15:31:33 -08:00
Craig Mautner
427dcdffc2 am 0324bb1a: am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev 
* commit '0324bb1a9972ec766b65d4b47b9688588633967b':
  Restore jankless transition keyguard-to-wallpaper
 2013-11-15 15:26:03 -08:00
Craig Mautner
0324bb1a99 am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev 
* commit '23188c2be4abb23f506b01ccd99884debd09cbb6':
  Restore jankless transition keyguard-to-wallpaper
 2013-11-15 15:20:18 -08:00
Craig Mautner
23188c2be4 Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev 2013-11-15 23:13:48 +00:00
Katie McCormick
ac21fd91fb am 1e5af1bc: am 0037930b: am 63cd3802: Doc update: update old console references. 
* commit '1e5af1bcfa3d6d3047a1b60b7abfeab6f3e9d81a':
  Doc update: update old console references.
 2013-11-15 14:50:30 -08:00
Katie McCormick
1e5af1bcfa am 0037930b: am 63cd3802: Doc update: update old console references. 
* commit '0037930bbea46ee9a818ff8e66bf7f334e467420':
  Doc update: update old console references.
 2013-11-15 14:45:07 -08:00
Alan Viverette
2525d9c843 Deprecate Activity.setTitleColor() 
BUG: 11712103
Change-Id: Id34ffb59d3f848c591a98880c6cdd9058e5a38dc
 2013-11-15 14:42:19 -08:00
Katie McCormick
0037930bbe am 63cd3802: Doc update: update old console references. 
* commit '63cd3802008010008aebc3a7a5d9fdf432cf0b5a':
  Doc update: update old console references.
 2013-11-15 22:39:21 +00:00
Katie McCormick
63cd380200 Doc update: update old console references. 
Change-Id: I54d50876022b308a4688293853b3e9227cb5e87c
 2013-11-15 22:33:13 +00:00
Mike Lockwood
6ae75780e9 Merge "Remove obsolete "headless" support" 2013-11-15 22:22:58 +00:00
Craig Mautner
de43ebe86a Restore jankless transition keyguard-to-wallpaper 
There is still a flash of black when going to a non-wallpaper activity
from keyguard. This is not a regression from jb-mr2 and any fixes to
clean it up are too risky at this late date.

Fixes (partially) bug 11570753.

Change-Id: I17aaae4ab8be570f7e28276a7b8ac4b8685e7551
 2013-11-15 14:15:43 -08:00
Joe Fernandez
9c5e8258e7 am 21be7734: am 33164786: am 5b93d259: Merge "docs: code fixes for OpenGL ES training" into klp-docs 
* commit '21be773432a008ee48d5c08b22a9d236772e3b53':
  docs: code fixes for OpenGL ES training
 2013-11-15 13:32:16 -08:00
Joe Fernandez
21be773432 am 33164786: am 5b93d259: Merge "docs: code fixes for OpenGL ES training" into klp-docs 
* commit '331647865554b5fe49d936452fed4dc1d86d7313':
  docs: code fixes for OpenGL ES training
 2013-11-15 13:26:22 -08:00
Joe Fernandez
3316478655 am 5b93d259: Merge "docs: code fixes for OpenGL ES training" into klp-docs 
* commit '5b93d259b8df98b011ac7f915b2c6602bc63f9fe':
  docs: code fixes for OpenGL ES training
 2013-11-15 21:22:17 +00:00
Joe Fernandez
5b93d259b8 Merge "docs: code fixes for OpenGL ES training" into klp-docs 2013-11-15 21:19:51 +00:00
Joe Fernandez
feaaea5b41 docs: code fixes for OpenGL ES training 
code sample fixes reviewed separately,
see Change-Id: I1d760b75d1f2bfe1ec90c71471867577bd146241

fixing bugs:
b/10798358
b/10796990
b/10603728
b/7962328

Change-Id: I1e0f6668ec8d2b103b88c385f1f067d30ecc7178
 2013-11-15 11:55:33 -08:00
Wink Saville
764043f2ba am 044bc25f: am 67979256: am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev 
* commit '044bc25fb58b6b89d4a6dca09863981877a9f337':
  Add config_restartRadioAfterProvisioning
 2013-11-15 11:50:12 -08:00
Wink Saville
044bc25fb5 am 67979256: am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev 
* commit '67979256865f63330a1352e450e26baf24e914ec':
  Add config_restartRadioAfterProvisioning
 2013-11-15 11:42:55 -08:00
Wink Saville
6797925686 am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev 
* commit '31cab2f803951edb13ea07e7e34916189fec5167':
  Add config_restartRadioAfterProvisioning
 2013-11-15 11:39:16 -08:00
Wink Saville
31cab2f803 Merge "Add config_restartRadioAfterProvisioning" into klp-dev 2013-11-15 19:35:05 +00:00