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

16721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
2f05de672c resolved conflicts for merge of a244c58a to master 
Change-Id: I26b889dc4bcf5cf1c7923757b362a8f448734c31
 2015-03-12 13:27:38 -07:00
Erik Kline
d07526464e Merge "Add 'dhcpcd' test target name" 2015-03-12 03:32:41 +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
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
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
Craig Stout
aaa3fa06b1 Default to using wrap content for row height. 
Change-Id: I902b292726bdf8fa1d2134b00fde1385cbccc4ae
(cherry picked from commit 24ad89cd2b)
 2015-03-03 00:04:15 +00:00
Craig Stout
21efbcc41e am d7eb2ab1: am 12f481fb: am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev 
* commit 'd7eb2ab1953a653c985b85dce487a16dd5e738ae':
  Updated to clarify division of functionality.
 2015-02-27 16:47:42 +00:00
Geoff Mendal
b27a27c2a4 am 222dead3: (-s ours) am dd4dc51a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '222dead36e3ca93b3e4d79fcd6c10cc7d5115184':
  Import translations. DO NOT MERGE
 2015-02-27 16:47:41 +00:00
Craig Stout
d7eb2ab195 am 12f481fb: am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev 
* commit '12f481fb8958846766ecbb420d5b429c72cd83eb':
  Updated to clarify division of functionality.
 2015-02-27 16:41:54 +00:00
Geoff Mendal
222dead36e am dd4dc51a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'dd4dc51a25d97d45e661dcb8d245a816413ec9e5':
  Import translations. DO NOT MERGE
 2015-02-27 16:39:46 +00:00
Craig Stout
12f481fb89 am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev 
* commit '5f6a8c4cbc6a0029663eb9e4fe517766b79e5c7f':
  Updated to clarify division of functionality.
 2015-02-27 16:34:55 +00:00
Craig Stout
5f6a8c4cbc Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev 2015-02-27 16:25:23 +00:00
Chris Banes
2068c6a59a Remove the old ActionBarCompat sample 
Change-Id: I04dfe8dd38e153ae8f28c3044a7e6d37f1a7d562
 2015-02-27 10:01:47 +00:00
Geoff Mendal
dd4dc51a25 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 07:26:04 +00:00
Geoff Mendal
e3e13c36a3 Import translations. DO NOT MERGE 
Change-Id: I44190f89c510bb0307eedda601ceaedcbe0b8baa
Auto-generated-cl: translation import
 2015-02-26 17:24:12 -08:00
Geoff Mendal
8f0ee3ca1f am bb43771d: (-s ours) am ee5bd86e: (-s ours) Import translations. DO NOT MERGE 
* commit 'bb43771d7891465cc58392e2e5bc90f133e7bca8':
  Import translations. DO NOT MERGE
 2015-02-26 23:21:31 +00:00
Geoff Mendal
bb43771d78 am ee5bd86e: (-s ours) Import translations. DO NOT MERGE 
* commit 'ee5bd86e43c9beba24bc6c254c6e131fc23b473b':
  Import translations. DO NOT MERGE
 2015-02-26 23:14:28 +00:00
Geoff Mendal
ee5bd86e43 Import translations. DO NOT MERGE 
Change-Id: I3a40482175025bb0c4d4882e13020f7647f93376
Auto-generated-cl: translation import
 2015-02-26 12:26:58 -08:00
Dake Gu
a827e50225 am 602c6910: am 6efdf6b7: am 69cabd12: ItemClickedListener -> ItemViewClickedListener 
* commit '602c69109002485984e8f10a0b473fe6f33ca98a':
  ItemClickedListener -> ItemViewClickedListener
 2015-02-26 02:16:01 +00:00
Dake Gu
602c691090 am 6efdf6b7: am 69cabd12: ItemClickedListener -> ItemViewClickedListener 
* commit '6efdf6b750429d6367ea161c537a64735cb8754e':
  ItemClickedListener -> ItemViewClickedListener
 2015-02-26 00:57:05 +00:00
Dake Gu
6efdf6b750 am 69cabd12: ItemClickedListener -> ItemViewClickedListener 
* commit '69cabd12e65bcebd2e1970bee03fa5b0535a4405':
  ItemClickedListener -> ItemViewClickedListener
 2015-02-26 00:50:58 +00:00
Dake Gu
69cabd12e6 ItemClickedListener -> ItemViewClickedListener 
Bug 19514090

Change-Id: Icf14e483b95d1bf5d57af9f27d977b0fdb686e67
 2015-02-25 15:39:17 -08:00
Jim Miller
94b490117c am 71abf355: am 34bdc613: am fe07a079: am 18c5fb7c: Fix the build 
* commit '71abf355011906353a571b471c04027bf2112804':
  Fix the build
 2015-02-25 19:11:20 +00:00
Jim Miller
71abf35501 am 34bdc613: am fe07a079: am 18c5fb7c: Fix the build 
* commit '34bdc6136f13d01af339fd0c8f1f569bb28d6971':
  Fix the build
 2015-02-25 19:04:55 +00:00
Jim Miller
34bdc6136f am fe07a079: am 18c5fb7c: Fix the build 
* commit 'fe07a079cad85aedba137dc6fca6b9c976844046':
  Fix the build
 2015-02-25 18:58:43 +00:00
Jim Miller
fe07a079ca am 18c5fb7c: Fix the build 
* commit '18c5fb7c2cb649b355eff5fc33022516e5af150c':
  Fix the build
 2015-02-25 18:52:03 +00:00
Jim Miller
18c5fb7c2c Fix the build 
This API was hidden for MR1.

Bug 19461292

Change-Id: Ib0a5ca536e843c91a142faeeccf684294aa3e274
 2015-02-25 10:37:37 -08:00
Dan Albert
418e964ef7 am 5e6df5ab: am f1c280b4: am 7ce263a8: Merge "Make adb_api.h safe to include first." 
* commit '5e6df5ab2a40d2562bf06b152b5c11bd3be0d341':
  Make adb_api.h safe to include first.
 2015-02-25 17:05:03 +00:00
Dan Albert
5e6df5ab2a am f1c280b4: am 7ce263a8: Merge "Make adb_api.h safe to include first." 
* commit 'f1c280b4c15b60308141093eff0c6b96a347e186':
  Make adb_api.h safe to include first.
 2015-02-25 16:52:57 +00:00
Dan Albert
f1c280b4c1 am 7ce263a8: Merge "Make adb_api.h safe to include first." 
* commit '7ce263a8512d2abe92957061c55fae383af88d44':
  Make adb_api.h safe to include first.
 2015-02-25 05:38:55 +00:00
Dan Albert
7ce263a851 Merge "Make adb_api.h safe to include first." 2015-02-25 05:32:47 +00:00