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

115210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lajos Molnar
1197bc37e5 am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '7e11b16b9f8896170d492240a5fd50c8bd04105d':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 16:40:26 -08:00
Lajos Molnar
7e11b16b9f VideoView: expand documentation on state save/restore limitations 
Change-Id: I46f231d314fc4ae8d9d11389aa62a3e2698122ed
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11412889
 2013-11-13 16:27:30 -08:00
Robert Greenwalt
4c514f2a68 am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev 
* commit '594eeb082e548617ff5092496888c43457593c2b':
  Fix for the invalid Global Proxy Setting
 2013-11-13 16:26:45 -08:00
Robert Greenwalt
594eeb082e Merge "Fix for the invalid Global Proxy Setting" into klp-dev 2013-11-14 00:22:46 +00:00
Craig Mautner
29bbd570fe am 1f0f9fa9: Merge "Add null pointer check." into klp-dev 
* commit '1f0f9fa94913198cd79b8d350cf9e8df8001daeb':
  Add null pointer check.
 2013-11-13 16:20:02 -08:00
Craig Mautner
1f0f9fa949 Merge "Add null pointer check." into klp-dev 2013-11-14 00:15:55 +00:00
Raj Mamadgi
92d02491ad Fix for the invalid Global Proxy Setting 
Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
bug:11598568

Change-Id: Idff5ae81119d8143da096b5291ecbfbc5875cbd4
 2013-11-14 00:08:21 +00:00
Ed Heyl
af49ff8c39 am a951fa56: merge in release branch changes (no-op). 
* commit 'a951fa56f1855cd0337bddacc01e35868c6d66d6':
  camera2: Remove prior repeating request when setting.
 2013-11-13 15:23:23 -08:00
Ed Heyl
a951fa56f1 merge in release branch changes (no-op). 2013-11-13 15:19:22 -08:00
Craig Mautner
ef1dd26ee7 am 0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been drawn." into klp-dev 
* commit '0e823a450a729a753fb8e0618474b6ae3cf3b810':
  Keyguard isn't visible if it hasn't been drawn.
 2013-11-13 15:14:45 -08:00
Craig Mautner
0e823a450a Merge "Keyguard isn't visible if it hasn't been drawn." into klp-dev 2013-11-13 23:11:12 +00:00
Craig Mautner
ada62fca51 Add null pointer check. 
Fixes bug 11673948.

Change-Id: I60b590b9793ae1b8d5c3d343f4bb6cb40ba4a092
 2013-11-13 15:09:55 -08:00
Baligh Uddin
22bc9f4381 am dc0acc6f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'dc0acc6f5d4cc8e4ed6d2a13793030350cd6262d':
  Import translations. DO NOT MERGE
 2013-11-13 14:42:44 -08:00
Baligh Uddin
dc0acc6f5d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 22:39:40 +00:00
Jeff Sharkey
529ba10693 am 711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev 
* commit '711d390be96531c5dfadb9a17e373f1e92ef16a1':
  Small DocumentsProvider doc improvements.
 2013-11-13 14:34:49 -08:00
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
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