LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,747 Commits 2 Branches 0 Tags
21c4a88a26c79c7a970ca0fd01e635ce82dd82a6
Commit Graph

16747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Stout
21c4a88a26 am 5f052b26: am 4c56adc9: am 09f91e6e: Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev 
* commit '5f052b26ee338e44d2f92f550a7b4c8d19d7282f':
  Fix missing api on kitkat.
 2015-03-17 20:03:45 +00:00
Xavier Ducrohet
7da359a1af am 2bc7c211: (-s ours) am 03dfa603: am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE. 
* commit '2bc7c21179ebdb30ced37459c006a55042a9fef3':
  Update build tools to 22.0.1. DO NOT MERGE.
 2015-03-17 20:03:42 +00:00
Craig Stout
5f052b26ee am 4c56adc9: am 09f91e6e: Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev 
* commit '4c56adc9164c172bff6832111c201cce5ddb01eb':
  Fix missing api on kitkat.
 2015-03-17 19:57:39 +00:00
Xavier Ducrohet
2bc7c21179 am 03dfa603: am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE. 
* commit '03dfa603106b1c707e835628ce3ef98279998dd7':
  Update build tools to 22.0.1. DO NOT MERGE.
 2015-03-17 19:57:33 +00:00
Craig Stout
4c56adc916 am 09f91e6e: Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev 
* commit '09f91e6e237024b7c9ece70cf296ec325e9f83d9':
  Fix missing api on kitkat.
 2015-03-17 19:51:03 +00:00
Craig Stout
09f91e6e23 Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev 2015-03-17 19:46:48 +00:00
Xavier Ducrohet
03dfa60310 am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE. 
* commit 'cd572c00327136d55d168add78515c9a932ddad2':
  Update build tools to 22.0.1. DO NOT MERGE.
 2015-03-16 22:36:58 +00:00
Xavier Ducrohet
cd572c0032 am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE. 
* commit '4ea9bca1234a5a122d4c8db39dc2b4dde5799928':
  Update build tools to 22.0.1. DO NOT MERGE.
 2015-03-16 22:28:04 +00:00
Xavier Ducrohet
4ea9bca123 Update build tools to 22.0.1. DO NOT MERGE. 
Bug: 19085051
Change-Id: Ia62982e7bee589c37f8a755d7e6bb51264556412
 2015-03-16 15:21:39 -07:00
Dianne Hackborn
3e8a010ab6 Merge "Add API demo for sharing." 2015-03-16 18:05:59 +00:00
Dan Albert
a489ea0141 am 73b3f5cd: am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too." 
* commit '73b3f5cde4bfdebbe4893f0234d1b0a9ddd09640':
  Fix SDK library paths for Windows and Darwin too.
 2015-03-14 04:08:35 +00:00
Dan Albert
73b3f5cde4 am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too." 
* commit '80dd2ac93d4e89c419eb9c57ddf3178212180564':
  Fix SDK library paths for Windows and Darwin too.
 2015-03-14 03:12:43 +00:00
Dan Albert
80dd2ac93d Merge "Fix SDK library paths for Windows and Darwin too." 2015-03-14 03:03:18 +00:00
Dan Albert
d4a1f0619b Fix SDK library paths for Windows and Darwin too. 
Change-Id: Ibaae6fd4089c804f50f8065e614c5de1b71c242b
 2015-03-14 02:34:38 +00:00
Dan Albert
89f9ff8893 am e0f3196e: am 170b153b: Merge "Fix library paths for SDK tools." 
* commit 'e0f3196e3a65d06874c21639ae4d5db7d82f0f78':
  Fix library paths for SDK tools.
 2015-03-14 00:17:27 +00:00
Dan Albert
e0f3196e3a am 170b153b: Merge "Fix library paths for SDK tools." 
* commit '170b153b3e3b087f77d806323a685ca0b4597561':
  Fix library paths for SDK tools.
 2015-03-14 00:13:10 +00:00
Dan Albert
170b153b3e Merge "Fix library paths for SDK tools." 2015-03-14 00:02:38 +00:00
Dan Albert
b7125622c8 Fix library paths for SDK tools. 
The rpath for the binaries is ../lib but the libraries were being
installed to the same directory as the executables.

Bug: 19617220
Change-Id: I5c4158698b6703843b67543d4396e2bffc5fb313
 2015-03-13 16:30:21 -07:00
Deepanshu Gupta
fcfd3a9621 am 62fdf40a: (-s ours) am 7e830841: am 0536cbb4: am b15f499b: Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev 
* commit '62fdf40a514cc33f1fa0c698b5279576c533c958':
  Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
 2015-03-13 05:53:56 +00:00
Xavier Ducrohet
2f05de672c resolved conflicts for merge of a244c58a to master 
Change-Id: I26b889dc4bcf5cf1c7923757b362a8f448734c31
 2015-03-12 13:27:38 -07:00
Dianne Hackborn
aa9e46deb6 Add API demo for sharing. 
Change-Id: I8f65979ab67297932e82f26eba8c4729725ee6d5
 2015-03-12 11:20:52 -07:00
Erik Kline
d07526464e Merge "Add 'dhcpcd' test target name" 2015-03-12 03:32:41 +00:00
Deepanshu Gupta
62fdf40a51 am 7e830841: am 0536cbb4: am b15f499b: Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev 
* commit '7e83084118875a79b820631b424d3989571d17dc':
  Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
 2015-03-12 00:52:38 +00:00
Deepanshu Gupta
7e83084118 am 0536cbb4: am b15f499b: Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev 
* commit '0536cbb4690578b60ae0db934f4b7bfbc2f36ec2':
  Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
 2015-03-12 00:45:24 +00:00
Deepanshu Gupta
0536cbb469 am b15f499b: Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev 
* commit 'b15f499b972ec3d09ac36feb15d5535c1b6cd030':
  Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
 2015-03-12 00:39:11 +00:00
Deepanshu Gupta
b15f499b97 Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev 2015-03-12 00:33:15 +00:00
Xavier Ducrohet
a244c58a5d am d0598e91: am 5db57146: am aeb400d3: Reset support version to <API>.0.0 
* commit 'd0598e911340c77194d315a2b6ad05c7afa9c1ec':
  Reset support version to <API>.0.0
 2015-03-11 17:24:13 +00:00
Adrian Roos
6826ec699f Merge "Revert "Fix the build"" 2015-03-11 16:05:40 +00:00
Deepanshu Gupta
06f472a302 Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE] 
Change-Id: I5060825f330a2da9234744510aa45eb283509113
 2015-03-10 17:59:16 -07:00
Xavier Ducrohet
d0598e9113 am 5db57146: am aeb400d3: Reset support version to <API>.0.0 
* commit '5db57146cdf8498dfefc12153fed2a3b19968dde':
  Reset support version to <API>.0.0
 2015-03-10 23:11:19 +00:00
Xavier Ducrohet
5db57146cd am aeb400d3: Reset support version to <API>.0.0 
* commit 'aeb400d30cbbc9d48689de3b75f92855f88d0861':
  Reset support version to <API>.0.0
 2015-03-10 23:05:31 +00:00
Xavier Ducrohet
aeb400d30c Reset support version to <API>.0.0 
Change-Id: I740e937ee51fcbcd0aafc054138f8939110d7cb6
 2015-03-10 15:24:16 -07:00
Xavier Ducrohet
95743e7505 am e66b671d: am 3565380e: am 2762443c: Merge "Mips system image also supports gpu." 
* commit 'e66b671dc72d62ca12dcb73fd4d3d6386dacabca':
  Mips system image also supports gpu.
 2015-03-10 18:15:22 +00:00
James Cook
5c42f75896 Re-enable the undo demo activity 
The UI now shows these input fields:
* A normal field with buttons for programmatic SetText, append and insert.
* A field with undo disabled.
* A field with a length limit (via InputFilter).
* A field with a credit card input formatter (via TextWatcher)

Bug: 19332904
Change-Id: I41df56c84dd5232918e7ee5e6ed5874b2023cc78
 2015-03-10 17:00:19 +00:00
Craig Stout
038b75ead3 Fix missing api on kitkat. 
Change-Id: I047b1d1198c262e1836bb43551a65c6eab8bc5b4
 2015-03-09 12:49:44 -07:00
Xavier Ducrohet
e66b671dc7 am 3565380e: am 2762443c: Merge "Mips system image also supports gpu." 
* commit '3565380e47cb2b471e390f0644c5953fe6758412':
  Mips system image also supports gpu.
 2015-03-09 19:27:11 +00:00
Xavier Ducrohet
3565380e47 am 2762443c: Merge "Mips system image also supports gpu." 
* commit '2762443cedb8703c9cd6da1382f3e93c20848868':
  Mips system image also supports gpu.
 2015-03-09 19:23:14 +00:00
Xavier Ducrohet
2762443ced Merge "Mips system image also supports gpu." 2015-03-09 19:06:46 +00:00
Adrian Roos
b9c9443703 Revert "Fix the build" 
This reverts commit 18c5fb7c2c, which
disabled the trust agent whitelisting in the sample device admin. Now
that the API is re-enabled, that code should be too.

Bug: 19461292
Change-Id: I85e3b4dcaab500ea9dd4b7e75490ca840ff396be
 2015-03-09 16:08:55 +00:00
Chris Craik
037d593168 Merge "Fix build - support new systrace file structure" 2015-03-06 23:07:50 +00:00
Chris Craik
1447a4987b Fix build - support new systrace file structure 
Change-Id: Ifcd97179b9d724ad8df6e623b492517d509d82dc
 2015-03-06 15:01:06 -08:00
P.Y. Laligand
d85a813a0e Updated the default classpath file for Eclipse. 
Still some errors left due to mismatched package names and directory structure.

Change-Id: Ibce0e094479e6ff6d5f0946cde9b5695625ac439
 2015-03-06 11:25:13 -08:00
Xavier Ducrohet
4c9fcb1363 am 05d097e1: am c4abfa22: am 3dbe2f82: am d9273517: Update version of the build tools to be 22.0.0 
* commit '05d097e1e739fb3135fbb1c97bb7e2d191be1c0a':
  Update version of the build tools to be 22.0.0
 2015-03-03 01:11:27 +00:00
Craig Stout
7003001b3c am 053eb7e9: am d07078d2: am aaa3fa06: Default to using wrap content for row height. 
* commit '053eb7e94662d44a67fc935d524bf6705b324c30':
  Default to using wrap content for row height.
 2015-03-03 01:11:24 +00:00
Xavier Ducrohet
05d097e1e7 am c4abfa22: am 3dbe2f82: am d9273517: Update version of the build tools to be 22.0.0 
* commit 'c4abfa22c2b0d2b8773826a6c5ed5b64d8a1bc6a':
  Update version of the build tools to be 22.0.0
 2015-03-03 01:03:23 +00:00
Craig Stout
053eb7e946 am d07078d2: am aaa3fa06: Default to using wrap content for row height. 
* commit 'd07078d2afbe2a30371ad32fba734f971ad9c669':
  Default to using wrap content for row height.
 2015-03-03 00:59:36 +00:00
Xavier Ducrohet
c4abfa22c2 am 3dbe2f82: am d9273517: Update version of the build tools to be 22.0.0 
* commit '3dbe2f827c219573c533b40fadfab908d785f0d2':
  Update version of the build tools to be 22.0.0
 2015-03-03 00:58:46 +00:00
Xavier Ducrohet
3dbe2f827c am d9273517: Update version of the build tools to be 22.0.0 
* commit 'd927351738285e17d0be3b4de6f90107e27764ec':
  Update version of the build tools to be 22.0.0
 2015-03-03 00:53:52 +00:00
Craig Stout
d07078d2af am aaa3fa06: Default to using wrap content for row height. 
* commit 'aaa3fa06b1ac88db5769e8f24f2c7524992fd661':
  Default to using wrap content for row height.
 2015-03-03 00:52:34 +00:00
Xavier Ducrohet
d927351738 Update version of the build tools to be 22.0.0 
Change-Id: I8c6c1ce2cd78665c7e9e806fabc3e6b94795cfa4
 2015-03-02 16:08:59 -08:00