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

182630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
36a35e366a Fix layer shader to store layer pointer 
bug:19419672

Change-Id: I4277348ceab41fbf45a107a8b21f64e2b4af23e0
 2015-02-18 17:47:21 +00:00
Adrian Roos
6c770900d6 Update strings for NetworkOverLimitActivity 
Bug: 17073752
Change-Id: I5c4de380df7d3261d447725b83a777459cb3c44f
 2015-02-18 17:02:10 +00:00
Kenny Guy
c627484653 Merge "Handle users being deleted in getUserHandle." 2015-02-18 16:56:52 +00:00
Geoff Mendal
52f6711233 Merge "Import translations. DO NOT MERGE" 2015-02-18 16:49:35 +00:00
John Spurlock
fadfc4e11b Merge "Volume prototypes: Allow delegate volume UI to set remote controller." 2015-02-18 16:12:14 +00:00
Geoff Mendal
cff9a9c62c Import translations. DO NOT MERGE 
Change-Id: Idb44934688545ba6e85530cab1a3fd513ff5ec1f
Auto-generated-cl: translation import
 2015-02-18 08:04:33 -08:00
Craig Mautner
2ada234d82 Merge "Refactor to split computeScreenConfigurationLocked" 2015-02-18 15:42:17 +00:00
Adrian Roos
44bc07d874 Fix typo 
Change-Id: If59381862e3332675fd7b929bcee2928ecd0da21
 2015-02-18 15:03:37 +00:00
Geoff Mendal
f9573360ee Merge "Import translations. DO NOT MERGE" 2015-02-18 14:50:45 +00:00
Geoff Mendal
d10f927b68 Import translations. DO NOT MERGE 
Change-Id: I1a52c8fef9730186416c08d59dff271e2af9c84a
Auto-generated-cl: translation import
 2015-02-18 06:39:52 -08:00
Geoff Mendal
99bf808382 am 7c4c7c67: (-s ours) am 8bd345f9: (-s ours) am 4a71ff87: (-s ours) Import translations. DO NOT MERGE 
* commit '7c4c7c67ef640e46d650a69715c53adeec8bd01f':
  Import translations. DO NOT MERGE
 2015-02-18 14:20:11 +00:00
Geoff Mendal
7c4c7c67ef am 8bd345f9: (-s ours) am 4a71ff87: (-s ours) Import translations. DO NOT MERGE 
* commit '8bd345f90d27d88a7929b874efd6fa57c0c38146':
  Import translations. DO NOT MERGE
 2015-02-18 14:14:01 +00:00
Geoff Mendal
8bd345f90d am 4a71ff87: (-s ours) Import translations. DO NOT MERGE 
* commit '4a71ff87b17acd54806a03f56bd1febdab7a4554':
  Import translations. DO NOT MERGE
 2015-02-18 14:07:41 +00:00
Geoff Mendal
a52d523d55 am c0334c7b: (-s ours) am 73087515: (-s ours) Import translations. DO NOT MERGE 
* commit 'c0334c7b44b898095b37c2b2f2217bf13d59b96b':
  Import translations. DO NOT MERGE
 2015-02-18 14:02:44 +00:00
Geoff Mendal
4a71ff87b1 Import translations. DO NOT MERGE 
Change-Id: Iec9356f31dd078b9bcff76203229ea03451487aa
Auto-generated-cl: translation import
 2015-02-18 06:00:48 -08:00
Geoff Mendal
c0334c7b44 am 73087515: (-s ours) Import translations. DO NOT MERGE 
* commit '73087515174b537fe94fbd4efe480be1ac04872f':
  Import translations. DO NOT MERGE
 2015-02-18 13:55:43 +00:00
Geoff Mendal
7308751517 Import translations. DO NOT MERGE 
Change-Id: Ic7373e3d8859d80c1472906c39ec46626b569c1b
Auto-generated-cl: translation import
 2015-02-18 05:47:24 -08:00
Kenny Guy
94a61e9414 Merge "Remove widgets for packages no longer whitelisted by admin" 2015-02-18 12:22:46 +00:00
Jorim Jaggi
3c30acf6cd Merge "Add theme for light status bar" 2015-02-18 11:52:22 +00:00
Christopher Tate
8561ff98cd am 32f216c3: am 8cd95aba: am 56238eaa: am 129ea76a: Fix wifi AP backup 
* commit '32f216c359540219905bbe0295da31e594d83f5f':
  Fix wifi AP backup
 2015-02-18 11:39:01 +00:00
Rich Slogar
90fa535569 am 27672017: am 6b5c3802: am c9cc2c22: am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943 
* commit '27672017956f5bb672cab15d0f0094018b6fa9d9':
  docs: note to install linux packages
 2015-02-18 11:37:57 +00:00
Chris Banes
4b201a5731 resolved conflicts for merge of cbc1ac33 to master 
Change-Id: I107320a07a1646f2ddc3a288b13ae58c538d96e6
 2015-02-18 11:32:48 +00:00
Andrew Solovay
2b40531c62 am 875b278c: am 6d6d0f91: am 46e881de: am 4eb14e02: am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge: 8d5ba01 
* commit '875b278c75de654d24224858aab3a6863540e319':
  docs: Noted that purchaseToken is long and cannot be truncated.
 2015-02-18 11:13:30 +00:00
Rich Sloager
263b8fb778 am 85b066cb: am 821bb7fd: am 3a69c24f: am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc 
* commit '85b066cb8a760ad1a20f7f758c3b7947aea96231':
  Revert "docs: studio proxy setup"
 2015-02-18 11:13:23 +00:00
Rich Slogar
6c65063aa0 am e9d86f58: am 9f807e7e: am 6de1fd98: am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989 
* commit 'e9d86f585399c69d8930b7cdfb0464f0ddd5f49a':
  docs: site mipmap folder updates
 2015-02-18 11:13:15 +00:00
Chris Banes
6026f73406 resolved conflicts for merge of 1c131eeb to master 
Change-Id: I886d726322514fa3b27cdc80b8dd57faa94bade5
 2015-02-18 11:02:49 +00:00
Svetoslav
d315ff7f28 Merge "Location settings not properly set." 2015-02-18 05:42:54 +00:00
Svetoslav
b596a2c5bf Location settings not properly set. 
Settings provider has special handling for location providers. The
code to set the location providers was calling itself recursively
instead of updating the setting value.

bug:19361236

Change-Id: I1ef1932c7faa8226b52123aa3f23f38048258328
 2015-02-17 21:41:05 -08:00
Wale Ogunwale
0233aee840 Merge "Fixed NPE in ResourceManager when Activity.recreate is called." 2015-02-18 03:23:39 +00:00
Svetoslav
456bca5f90 Merge "Remove unnecessary volume validators" 2015-02-18 02:36:13 +00:00
Svetoslav
1b71ea9b09 Remove unnecessary volume validators 
Change-Id: I5f13016fa23978c8d35e9b85ec0ebecdf40a3d74
 2015-02-17 18:35:02 -08:00
Christopher Tate
32f216c359 am 8cd95aba: am 56238eaa: am 129ea76a: Fix wifi AP backup 
* commit '8cd95aba2f97eb552d437c185b156ba964886a6e':
  Fix wifi AP backup
 2015-02-18 02:23:06 +00:00
Christopher Tate
8cd95aba2f am 56238eaa: am 129ea76a: Fix wifi AP backup 
* commit '56238eaaa3688c9a9858058f4dc63aade7092d9b':
  Fix wifi AP backup
 2015-02-18 02:17:57 +00:00
Christopher Tate
56238eaaa3 am 129ea76a: Fix wifi AP backup 
* commit '129ea76a4a129fb3e8e997e8c604c0712e8a9d73':
  Fix wifi AP backup
 2015-02-18 02:07:55 +00:00
Jeff Sharkey
fb19a6533c Merge "More lint tests." 2015-02-18 01:22:48 +00:00
Jeff Sharkey
b46a9690d5 More lint tests. 
When overloading methods, verify that common arguments always come
first and have consistent ordering.

When methods register listeners or callbacks (outside of the UI
toolkit), verify that an overload exists that takes a Handler to
deliver events through.

When a method accepts a Context argument, it must be the first
argument.

Change-Id: I6a6f94a3a0a8c48987835e47eb87564e569db2af
 2015-02-17 17:19:45 -08:00
Christopher Tate
129ea76a4a Fix wifi AP backup 
An OutputStream buffers only by explicit contract.  OutputStreamWriter
buffers internally, always.  Do not get these behaviors confused.

Bug 19341967

Change-Id: I0610ed625b0175620083dd286f3a73c24956b171
 2015-02-17 17:07:37 -08:00
Craig Mautner
7fe224e8e9 Refactor to split computeScreenConfigurationLocked 
Split into two methods, one that updates the Display and
another that updates the Configuration.

Change-Id: I7b503311da5bfddea2650cdb7dbb447e7a1d09cc
 2015-02-17 17:06:07 -08:00
Wale Ogunwale
93f543ca98 Fixed NPE in ResourceManager when Activity.recreate is called. 
Bug: 19408756
Change-Id: I291badce7fe9a6feaf2a5e8ce1005e6a86b30147
 2015-02-17 16:55:03 -08:00
Tim Murray
63f0a7d058 Merge "Revert "Revert "Add BLAS intrinsic.""" 2015-02-18 00:44:33 +00:00
Tim Murray
3d8215a070 Revert "Revert "Add BLAS intrinsic."" 
This reverts commit aaab02a91fcb33388d958a6402b2e77481a0d5b2.

Change-Id: Iabc3684a9a8c2f9a781029f55120f0346ee9b289
 2015-02-18 00:44:08 +00:00
Marco Nelissen
8c98b8eb68 am 2fddfea3: am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev 
* commit '2fddfea3e5311bb5503d148d7ad18240a13ee033':
  Fix NPE
 2015-02-18 00:40:19 +00:00
Craig Mautner
6868e78180 am 2007a630: (-s ours) am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 
* commit '2007a630d4767b4e90f8ed727acd574424c2183c':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-02-18 00:40:14 +00:00
Rich Slogar
2767201795 am 6b5c3802: am c9cc2c22: am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943 
* commit '6b5c3802e1a8bd6a17b89ff8ce17aee13e9b2842':
  docs: note to install linux packages
 2015-02-18 00:33:02 +00:00
Rich Slogar
cbc1ac33a4 am 3f9b7438: am 958f6505: am f82c88e2: am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge: 5f31276 
* commit '3f9b7438fb5da9d366d2a950f5a5c22aa15601a0':
  docs: studio training basics create and run project updates
 2015-02-18 00:32:55 +00:00
Andrew Solovay
875b278c75 am 6d6d0f91: am 46e881de: am 4eb14e02: am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge: 8d5ba01 
* commit '6d6d0f91bf694ead8fff5050101e327c59302a19':
  docs: Noted that purchaseToken is long and cannot be truncated.
 2015-02-18 00:32:45 +00:00
Rich Sloager
85b066cb8a am 821bb7fd: am 3a69c24f: am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc 
* commit '821bb7fdef6ae983a9c90ee9c763b941eba662a5':
  Revert "docs: studio proxy setup"
 2015-02-18 00:32:39 +00:00
Rich Slogar
e9d86f5853 am 9f807e7e: am 6de1fd98: am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989 
* commit '9f807e7ef2793e02b592afa33d73633bb9343c4c':
  docs: site mipmap folder updates
 2015-02-18 00:32:32 +00:00
Rich Slogar
1c131eeb99 am 27402330: am b7fee4f4: am 6cdde671: am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge: c694604 
* commit '2740233048452a10f5eebd0117e7c598faa65c80':
  docs: studio mipmap update
 2015-02-18 00:32:25 +00:00
Alan Viverette
cc72f61adf am b20d48fd: am 014442c2: am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev 
* commit 'b20d48fd20928cf3167ee37649d702c90c7e0218':
  Revert "Fixed accessibility for the pin input view on keyguard."
 2015-02-18 00:30:24 +00:00