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

115297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
711d390be9 Merge "Small DocumentsProvider doc improvements." into klp-dev 2013-11-13 22:31:01 +00:00
Jim Miller
291b7f5615 am 3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev 
* commit '3714473f1a077cae6eca3079da67a7dd09dcff65':
  Enable fast camera transition when launched from navbar
 2013-11-13 14:28:06 -08:00
Jim Miller
cefe47c0d3 am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev 
* commit '9c8d56a692198a3fc1629a0407ea6027f04e9a91':
  Reduce camera launch time by about 250ms.
 2013-11-13 14:24:26 -08:00
Svetoslav Ganov
852a8895e1 am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 
* commit 'd697ba73b5a5fc5dc502a117a8f06e8f1a5359b9':
  Fix NPE at PrintSpooler in Japanese environment.
 2013-11-13 14:24:23 -08:00
Jim Miller
3714473f1a Merge "Enable fast camera transition when launched from navbar" into klp-dev 2013-11-13 22:23:34 +00:00
Jim Miller
9c8d56a692 Merge "Reduce camera launch time by about 250ms." into klp-dev 2013-11-13 22:22:13 +00:00
Svetoslav Ganov
d697ba73b5 Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 2013-11-13 22:19:57 +00: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
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
026d06847b am 90b7f631: Doc change: fix typo. 
* commit '90b7f6311849fb68d2bc5fa0affb86c7e5d3a3b0':
  Doc change: fix typo.
 2013-11-13 21:15:42 +00: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
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
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
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
Raphael Moll
c95bfc4dc8 am 7b0d9a50: Merge "Android Studio download for 0.3.2" into klp-docs 
* commit '7b0d9a50b4f19dfd89a20b5fd004a014ae8ec02b':
  Android Studio download for 0.3.2
 2013-11-13 18:13:08 +00:00
Raphael Moll
7b0d9a50b4 Merge "Android Studio download for 0.3.2" into klp-docs 2013-11-13 18:09:20 +00:00
Glenn Kasten
34262cdfc5 Replace keyboard sounds with latest (softer) design 
Make AudioPackage8 (N7 v1) and AudioPackage9 (N10) more like
AudioPackage12_48 (N5).

Bug: 11158758
Change-Id: I55052218f62159fd90efb21be19e19509eb11afe
 2013-11-13 09:17:46 -08:00
Jeff Brown
a20f625cc1 am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev 
* commit '41b92b008e03be95db938e0238ccb9373c2aaadc':
  Finalize assets for screen casting.
 2013-11-13 08:54:27 -08:00
Jeff Brown
41b92b008e Merge "Finalize assets for screen casting." into klp-dev 2013-11-13 16:51:53 +00:00
John Spurlock
79033da8e4 am 7d667ee2: Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev 
* commit '7d667ee2de2c6add257466d9648024d7e8402926':
  Ensure wallpaper hint is at least as large as the display.
 2013-11-13 08:45:46 -08:00
John Spurlock
7d667ee2de Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev 2013-11-13 16:41:44 +00:00
Deepanshu Gupta
6870d29c34 am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE 
* commit '78cfdf31b7c48589ea3a148ec1d6d573235bc06b':
  Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
 2013-11-13 08:40:08 -08:00
Deepanshu Gupta
78cfdf31b7 Update changed delegate method in Bitmap_Delegate. DO NOT MERGE 
Issue: https://code.google.com/p/android/issues/detail?id=60167
Change-Id: I3e1d6b9d52ca899889ba758b0ea91bd742cf5005
 2013-11-13 18:15:51 +05:30
Jeff Brown
e7ae644522 Finalize assets for screen casting. 
Extend wifi display connection timeout.

Show a notification while connecting to wifi display.

Ensure that remote display providers are really trusted before
connecting to them.

Bug: 11257292
Change-Id: Iad0caaa30d7946df818bc75ade071f2e377f8a53
 2013-11-13 02:17:53 -08:00
Jean Chalard
f86e81c4ff [DO NOT MERGE] Improve documentation for InputType and EditorInfo. 
Bug: 11245912
Change-Id: If00bb540f25b176da803af0e02fc1ce1b46537e1
 2013-11-13 15:29:16 +09:00
Jean Chalard
d952ac4c17 am 218ecd43: Fix the docs build 
* commit '218ecd43946001f07b60757db130ef5585d474d3':
  Fix the docs build
 2013-11-12 22:27:47 -08:00
Jean Chalard
218ecd4394 Fix the docs build 
Change-Id: I05f1f39aaa9d72201a7fd06377799246039cd505
 2013-11-13 15:20:58 +09:00
Jean Chalard
383ef79d14 am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev 
* commit '7d57b7a35bd64d271b666f16aa1e85a4c2b99ca7':
  Improve documentation for InputType and EditorInfo.
 2013-11-12 21:22:03 -08:00
Jean Chalard
7d57b7a35b Merge "Improve documentation for InputType and EditorInfo." into klp-dev 2013-11-13 05:19:36 +00:00
Dirk Dougherty
0deaa273bd am ee8f2a64: Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs 
* commit 'ee8f2a647eb08ab39d6f622cef3cdad20d79463a':
  Doc change: Update Play for Edu docs for full launch.
 2013-11-13 04:45:12 +00:00
Dirk Dougherty
ee8f2a647e Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs 2013-11-13 04:25:53 +00:00
Dirk Dougherty
4dfd8b48ff Doc change: Update Play for Edu docs for full launch. 
Change-Id: I50a1bfa6087383a5e7a10051e9a73ada96980297
 2013-11-12 20:07:07 -08:00
The Android Automerger
b9480186c9 merge in klp-mr1-release history after reset to klp-dev 2013-11-12 20:00:43 -08:00