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

120087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
d697ba73b5 Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 2013-11-13 22:19:57 +00:00
Baligh Uddin
eae7159444 Import translations. DO NOT MERGE 
Change-Id: I8788c70c6920a36c5187ad415e5d17d3b7d525ca
Auto-generated-cl: translation import
 2013-11-13 13:43:06 -08:00
Svetoslav
b1c305f9fc am e84f23b5: am 60020252: am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev 
* commit 'e84f23b5fd72c03ca4c8cbef3bc1fde4eec29f36':
  Update the PrintDocumentAdapter docs.
 2013-11-13 13:42:57 -08:00
Baligh Uddin
b4aac8d832 Import translations. DO NOT MERGE 
Change-Id: I11d764583416d7fb4dfc85ebe81a98b6a1267424
Auto-generated-cl: translation import
 2013-11-13 13:39:45 -08:00
Svetoslav
e84f23b5fd am 60020252: am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev 
* commit '60020252db88825b0c0951de7fef6f07d68786a9':
  Update the PrintDocumentAdapter docs.
 2013-11-13 13:38:21 -08:00
Svetoslav
60020252db am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev 
* commit '14f300803b7d16a3c9632cb626529e873e4813f1':
  Update the PrintDocumentAdapter docs.
 2013-11-13 13:34:00 -08:00
Jeff Sharkey
3b945405cf Small DocumentsProvider doc improvements. 
Bug: 11670294
Change-Id: I5fb91c7665fc2a4531059ef9f2de0972ebabe1ea
 2013-11-13 13:31:17 -08:00
Svetoslav
14f300803b Merge "Update the PrintDocumentAdapter docs." into klp-dev 2013-11-13 21:30:58 +00:00
Dirk Dougherty
2e625c4a00 am 7c85b522: am 026d0684: am 90b7f631: Doc change: fix typo. 
* commit '7c85b522e3c42f762d6b1d2f62130173a165d246':
  Doc change: fix typo.
 2013-11-13 13:23:12 -08:00
Baligh Uddin
d52fee46dc Merge "Import translations. DO NOT MERGE" 2013-11-13 21:19:39 +00:00
Dirk Dougherty
7c85b522e3 am 026d0684: am 90b7f631: Doc change: fix typo. 
* commit '026d06847b535da75626211bae400729deb80f9b':
  Doc change: fix typo.
 2013-11-13 13:18:55 -08:00
Baligh Uddin
a0604a788d am 2218d330: (-s ours) am 814b0b73: (-s ours) am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2218d330ad4bda30311d8552cc2140484d636678':
  Import translations. DO NOT MERGE
 2013-11-13 13:16:11 -08:00
Baligh Uddin
0c51446d22 am d0e2b18f: (-s ours) am 4a0e3b9a: (-s ours) am 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd0e2b18f55723ec2b045a28ad16b8edc07d27ad8':
  Import translations. DO NOT MERGE
 2013-11-13 13:16:08 -08:00
Dirk Dougherty
026d06847b am 90b7f631: Doc change: fix typo. 
* commit '90b7f6311849fb68d2bc5fa0affb86c7e5d3a3b0':
  Doc change: fix typo.
 2013-11-13 21:15:42 +00:00
Baligh Uddin
2218d330ad am 814b0b73: (-s ours) am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '814b0b734772bfdbaa6b1888a253afc00c78bb58':
  Import translations. DO NOT MERGE
 2013-11-13 13:11:53 -08:00
Baligh Uddin
d0e2b18f55 am 4a0e3b9a: (-s ours) am 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4a0e3b9ac5cb9006a3efe951fcd7f7427d4726cc':
  Import translations. DO NOT MERGE
 2013-11-13 13:11:50 -08:00
Craig Mautner
5c7bd01705 Keyguard isn't visible if it hasn't been drawn. 
Reduces jank in multiuser lock from QuickSettings. The launcher and
wallpaper were being hidden as soon as the surface for the keyguard
was created. Now they are not hidden until the keyguard has been
drawn. This still leaves a short time where there is a black screen
but it is considerably shorter than it was. Comparable to jb now.

Fixes bug 11046339.

Change-Id: I349d95dba72da27e5c05a7a64c95a2774d17a34e
 2013-11-13 13:09:35 -08:00
Dirk Dougherty
90b7f63118 Doc change: fix typo. 
Change-Id: I74932b2dff099af1ba2bc048575586fd9e3593a5
 2013-11-13 13:08:46 -08:00
Baligh Uddin
2d11b48b5f Import translations. DO NOT MERGE 
Change-Id: I708597a97a9b4bf82eab684dcf4e743a9cdf1eb5
Auto-generated-cl: translation import
 2013-11-13 13:07:54 -08:00
Baligh Uddin
814b0b7347 am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2a22627e179cdb767c709dc68d78b4903d9239f9':
  Import translations. DO NOT MERGE
 2013-11-13 13:07:52 -08:00
Baligh Uddin
4a0e3b9ac5 am 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5cc3ddf16fee6d6aa8439e6ebcb3f3feeec98608':
  Import translations. DO NOT MERGE
 2013-11-13 13:07:49 -08:00
Baligh Uddin
2a22627e17 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 21:04:25 +00:00
Baligh Uddin
5cc3ddf16f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 21:04:07 +00:00
Sailesh Nepal
b661469818 Merge "Add ThirdPartyCall APIs to master" 2013-11-13 20:48:50 +00:00
Sailesh Nepal
697d9f2f30 Add ThirdPartyCall APIs to master 
These are APIs for the new ThirdPartyPhone feature.

Note, these APIs can't actually be used yet on master for two reasons:
  - initiating a call from a 3rd party app isn't possible yet because
    the TelephonyManager APIs aren't being added to master.
  - the TeleService implementation of these APIs aren't being added to
    master.

Also, these APIs will be removed and the final ones will be added
once they're ready to be merged into master.

Change-Id: Ie783290451da448a011f813983e55b12047b5d99
 2013-11-13 12:27:21 -08:00
Baligh Uddin
bc3be0e3dc Import translations. DO NOT MERGE 
Change-Id: I3b40e99b029a65ade59ec8f7ad06c0a143895269
Auto-generated-cl: translation import
 2013-11-13 12:24:32 -08:00
Christopher Tate
a46c7f32d3 am 87b84ca6: am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev 
* commit '87b84ca6fc5070f2fbbb5f6d94863680b33d188b':
  Support preferred activities with zero or one scheme in the filter
 2013-11-13 12:20:08 -08:00
Daniel Sandler
bd8492b564 am 08603411: am 2f4fb5ee: am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev 
* commit '086034117d9214de6339a29b93412276eb00afea':
  Bespoke, handcrafted, artisanal assist affordance assets.
 2013-11-13 12:20:05 -08:00
Daniel Sandler
8831a7aceb am 076dcaf1: am 80ffcb19: am 42498417: Merge "DessertCase fixes:" into klp-dev 
* commit '076dcaf11b4fd3deef52bddfc2b2e7727f6364a1':
  DessertCase fixes:
 2013-11-13 12:20:01 -08:00
Daniel Sandler
296c206a25 am 94913629: am 6150abd8: am f554042a: Merge "Switch DeadZone to Slog." into klp-dev 
* commit '94913629bee49a035e33d387e5e303736b82ac51':
  Switch DeadZone to Slog.
 2013-11-13 12:19:57 -08:00
John Huang
3803ea0892 am c4f535bd: am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev 
* commit 'c4f535bddac2491aa0e354a609fcbf7c49276295':
  Get rid of a race in NsdService in stopResolveService and getAddrInfo
 2013-11-13 12:19:53 -08:00
Christopher Tate
87b84ca6fc am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev 
* commit 'e995ad1559ac12a0ac5e2e56ce378b0b29f10f24':
  Support preferred activities with zero or one scheme in the filter
 2013-11-13 12:14:29 -08:00
Daniel Sandler
086034117d am 2f4fb5ee: am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev 
* commit '2f4fb5eef5ac5c08f7d30c75b56990ce5a729509':
  Bespoke, handcrafted, artisanal assist affordance assets.
 2013-11-13 12:14:25 -08:00
Daniel Sandler
076dcaf11b am 80ffcb19: am 42498417: Merge "DessertCase fixes:" into klp-dev 
* commit '80ffcb194b31839308bbe57c057611fd41cef5e1':
  DessertCase fixes:
 2013-11-13 12:14:22 -08:00
Daniel Sandler
94913629be am 6150abd8: am f554042a: Merge "Switch DeadZone to Slog." into klp-dev 
* commit '6150abd8f9557a923e1e9753d5c35d241cd79411':
  Switch DeadZone to Slog.
 2013-11-13 12:14:19 -08:00
John Huang
c4f535bdda am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev 
* commit '299e011ebd7ce9593c203ecfc9f5eed45360a5ed':
  Get rid of a race in NsdService in stopResolveService and getAddrInfo
 2013-11-13 12:14:16 -08:00
Christopher Tate
e995ad1559 am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev 
* commit '0b2c2b10053afd7a525dbf8a4eb0f0aaf98739b3':
  Support preferred activities with zero or one scheme in the filter
 2013-11-13 12:07:22 -08:00
Daniel Sandler
2f4fb5eef5 am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev 
* commit '31f7c912f0b6a2cfa2ea0f0b3a9022e8323f5542':
  Bespoke, handcrafted, artisanal assist affordance assets.
 2013-11-13 12:07:20 -08:00
Daniel Sandler
80ffcb194b am 42498417: Merge "DessertCase fixes:" into klp-dev 
* commit '424984172bb2a89dd06cc49fd5a3665bc7c85e5c':
  DessertCase fixes:
 2013-11-13 12:07:16 -08:00
Daniel Sandler
6150abd8f9 am f554042a: Merge "Switch DeadZone to Slog." into klp-dev 
* commit 'f554042a9582c5b4ad1b0d41bc08a0caad470798':
  Switch DeadZone to Slog.
 2013-11-13 12:07:13 -08:00
John Huang
299e011ebd am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev 
* commit '54ca906604c2ff0a58274e5d1b66cdba4df8c3d8':
  Get rid of a race in NsdService in stopResolveService and getAddrInfo
 2013-11-13 12:07:10 -08:00
Baligh Uddin
9f500fe103 Import translations. DO NOT MERGE 
Change-Id: Id312643b2e858fa84f81b37975a1757ff1773b87
Auto-generated-cl: translation import
 2013-11-13 11:54:28 -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
Christopher Tate
0b2c2b1005 Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev 2013-11-13 19:33:46 +00:00
Daniel Sandler
31f7c912f0 Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev 2013-11-13 19:32:42 +00:00
Daniel Sandler
424984172b Merge "DessertCase fixes:" into klp-dev 2013-11-13 19:32:27 +00:00
Daniel Sandler
f554042a95 Merge "Switch DeadZone to Slog." into klp-dev 2013-11-13 19:32:24 +00:00
John Huang
54ca906604 Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev 2013-11-13 19:14:00 +00:00
Robert Greenwalt
c07094c88d am 955b575d: am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService" 
* commit '955b575dd94370f618f6b6424d60c1aa9dc34c14':
  Fix NPE in ConnectivityService
 2013-11-13 10:33:56 -08:00
Robert Greenwalt
955b575dd9 am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService" 
* commit '6eddb39c857b178672218a345a276c4304e7ad37':
  Fix NPE in ConnectivityService
 2013-11-13 10:27:46 -08:00