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

16747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Banes
5fdbf91821 Merge "Revert "Disable design lib in master build file"" into lmp-mr1-ub-dev 2015-04-09 07:17:13 +00:00
Chris Banes
d1723b40dd Revert "Disable design lib in master build file" 
This reverts commit 988f263d5a.

Change-Id: Ieec3403b2f5976115aa9afe662bd6617ec86dd38
 2015-04-09 07:16:59 +00:00
Chris Banes
4f10c76afc Merge "Disable design lib in master build file" into lmp-mr1-ub-dev 2015-04-08 11:24:35 +00:00
Chris Banes
988f263d5a Disable design lib in master build file 
Change-Id: I60a42f56b62fa68987e277ce5045d3d672dcf441
 2015-04-08 10:18:59 +01:00
Chris Banes
97930fc88b Disable the design support library and demos 
Change-Id: Ia0247179d3230d0ec2a198d458bc417fe3102d9d
 2015-04-08 08:11:06 +01:00
Chris Banes
e1556d3dfc Revert "Remove the redundant dependency on Support7Demos" 
This reverts commit 12edcb5d03.

Change-Id: Ie9ab4114afb2a674fdfd2bae535ebac8e18a5ec9
 2015-04-07 19:22:45 +00:00
Chris Banes
12edcb5d03 Remove the redundant dependency on Support7Demos 
Change-Id: I5cf4e061547ad33caa71f802f7a36b36468d17bf
 2015-04-07 19:17:46 +01:00
Andreas Gampe
0fc23e5f0d am 4195b769: am 9ec6712d: Merge "Development/scripts: Update gdbclient for native bridge" 
* commit '4195b7696c9cbec60e6e25620f9e699fbb23ad9f':
  Development/scripts: Update gdbclient for native bridge
 2015-04-06 21:02:00 +00:00
Andreas Gampe
4195b7696c am 9ec6712d: Merge "Development/scripts: Update gdbclient for native bridge" 
* commit '9ec6712d590adb732fc02608041dbb340143cfad':
  Development/scripts: Update gdbclient for native bridge
 2015-04-06 20:52:42 +00:00
Andreas Gampe
9ec6712d59 Merge "Development/scripts: Update gdbclient for native bridge" 2015-04-06 20:31:14 +00:00
Andreas Gampe
512cc91be2 Development/scripts: Update gdbclient for native bridge 
The Nexus Player has a mixed abi-list, but native applications are
still x86. Move x86 ahead to prefer it over arm.

Change-Id: I3e2f3dc0da97b94078f7fd5dc3fede711603961a
 2015-04-06 13:29:57 -07:00
Trevor Johns
01a33e9d3b am 2bffe4f4: am f4d1982e: am eba484fb: am 951e7288: Fix browseable category for NfcProvisioning sample 
* commit '2bffe4f46b1aa5d9c60d04b911a73b803785e5d2':
  Fix browseable category for NfcProvisioning sample
 2015-04-02 23:22:34 +00:00
Trevor Johns
2bffe4f46b am f4d1982e: am eba484fb: am 951e7288: Fix browseable category for NfcProvisioning sample 
* commit 'f4d1982e31b3a27ae19bae89f3981df5ad76394f':
  Fix browseable category for NfcProvisioning sample
 2015-04-02 23:11:48 +00:00
Trevor Johns
f4d1982e31 am eba484fb: am 951e7288: Fix browseable category for NfcProvisioning sample 
* commit 'eba484fbd45ba57a3fd831a74eb42e398e776cb3':
  Fix browseable category for NfcProvisioning sample
 2015-04-02 21:29:31 +00:00
Trevor Johns
eba484fbd4 am 951e7288: Fix browseable category for NfcProvisioning sample 
* commit '951e7288e6bea6ed91f510e3cdefc7110b4de353':
  Fix browseable category for NfcProvisioning sample
 2015-04-02 21:21:24 +00:00
Trevor Johns
951e7288e6 Fix browseable category for NfcProvisioning sample 
Synced with developers/samples/android commit
0a4e12c1bc019a34549c6e88260879e2da49ce7c.

Change-Id: Ia75c0e01ce61679d87ab88e80c6db97006aaa1e0
 2015-04-02 13:29:30 -07:00
Craig Stout
381fe1c9ca Merge "Add BackgroundManager release." into lmp-mr1-ub-dev 2015-04-02 20:04:11 +00:00
Chris Craik
5c783cb0f3 am 625dde7b: am 630b075c: Merge "Fix build - support new systrace file structure" 
* commit '625dde7bdf6726b967733bb8b506734824cd6b5a':
  Fix build - support new systrace file structure
 2015-04-01 20:20:26 +00:00
Chris Craik
625dde7bdf am 630b075c: Merge "Fix build - support new systrace file structure" 
* commit '630b075cdb4299e72d26d8cb355a28c342479201':
  Fix build - support new systrace file structure
 2015-04-01 20:09:59 +00:00
Chris Craik
630b075cdb Merge "Fix build - support new systrace file structure" 2015-04-01 19:50:04 +00:00
Chris Craik
6941c574cf Fix build - support new systrace file structure 
Change-Id: Ifcd97179b9d724ad8df6e623b492517d509d82dc
 2015-03-30 18:07:32 -07:00
Trevor Johns
b2c35d1597 am 2298d3b4: am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release 
* commit '2298d3b48d5bdbb1b6b3e1ea081fede26af7bae0':
  Update sdk.atree and samples/browseable for lastest samples release
 2015-03-31 00:07:15 +00:00
Trevor Johns
2298d3b48d am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release 
* commit '0d473ea178b5120ae45249c4d644cd00e876e63e':
  Update sdk.atree and samples/browseable for lastest samples release
 2015-03-31 00:00:49 +00:00
Trevor Johns
0d473ea178 am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release 
* commit '721cd1b86ac6638b55b0fb20f12695aa32916dd9':
  Update sdk.atree and samples/browseable for lastest samples release
 2015-03-30 23:54:56 +00:00
Trevor Johns
721cd1b86a am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release 
* commit '77b5d394ff91872896c69f5cee93a126f3aed92e':
  Update sdk.atree and samples/browseable for lastest samples release
 2015-03-30 23:47:14 +00:00
Trevor Johns
77b5d394ff Update sdk.atree and samples/browseable for lastest samples release 
Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.

Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
 2015-03-30 16:06:43 -07:00
Chris Banes
eb072c1c17 Merge "Add hide on scroll demo" into lmp-mr1-ub-dev 2015-03-30 20:50:48 +00:00
Dan Albert
e1915bdd63 am 3ba45f78: am 2474617f: Merge "Allow libbase to be used on Windows." 
* commit '3ba45f7871ff9705ed6e994304c44b724feed2a2':
  Allow libbase to be used on Windows.
 2015-03-30 18:43:42 +00:00
Dan Albert
3ba45f7871 am 2474617f: Merge "Allow libbase to be used on Windows." 
* commit '2474617f0162c7de1c359321071706540983cd2d':
  Allow libbase to be used on Windows.
 2015-03-30 18:36:33 +00:00
Dan Albert
2474617f01 Merge "Allow libbase to be used on Windows." 2015-03-30 17:47:20 +00:00
Xavier Ducrohet
4da695a3c3 am 54b50638: am e9013bf3: am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE. 
* commit '54b50638ad3e36235c917987eccc7255ee1c6308':
 2015-03-27 01:23:38 +00:00
Xavier Ducrohet
54b50638ad am e9013bf3: am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE. 
* commit 'e9013bf3291c8eeccb1d6f793640b94d30186cf1':
 2015-03-27 01:08:48 +00:00
Xavier Ducrohet
e9013bf329 am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE. 
* commit '835221bfd3a67629525ae601fce968302c35980d':
 2015-03-27 00:48:55 +00:00
Xavier Ducrohet
835221bfd3 am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE. 
* commit 'd9e9e60f22109b3c8966a41c25b223f40a3d51f9':
  Update build tools version to 22.0.2. DO NOT MERGE.
 2015-03-27 00:33:32 +00:00
Chih-Hung Hsieh
62120b2c63 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/development into lmp-mr1-ub-dev 2015-03-26 21:28:02 +00:00
The Android Automerger
66238783b3 am 7570c73e: am dfe61de0: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 
* commit '7570c73e1014ccd5c49fe2e35bec92d5faa4fb41':
  Update version of the build tools to be 22.0.0
 2015-03-26 21:19:45 +00:00
The Android Automerger
7570c73e10 am dfe61de0: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 
* commit 'dfe61de07eacf1f650911f717b55abb195708033':
  Update version of the build tools to be 22.0.0
 2015-03-26 21:00:24 +00:00
Craig Stout
dcaafe81c8 Add BackgroundManager release. 
Change-Id: I5a4af31a214f2db26a399db39cf73d578dcbc71c
 2015-03-25 09:38:21 -07:00
Xavier Ducrohet
c2fd9a355c am 7012c6fc: am 7fc65bda: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE. 
* commit '7012c6fcdb9cf22baa57ea6fb880704f5295635d':
  Update build tools version to 22.0.2. DO NOT MERGE.
 2015-03-24 01:26:58 +00:00
Xavier Ducrohet
7012c6fcdb am 7fc65bda: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE. 
* commit '7fc65bda5beffc76ff249e59103469c1b46c10f7':
  Update build tools version to 22.0.2. DO NOT MERGE.
 2015-03-24 01:20:53 +00:00
Xavier Ducrohet
7fc65bda5b am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE. 
* commit 'd9e9e60f22109b3c8966a41c25b223f40a3d51f9':
  Update build tools version to 22.0.2. DO NOT MERGE.
 2015-03-24 01:14:41 +00:00
Xavier Ducrohet
d9e9e60f22 Update build tools version to 22.0.2. DO NOT MERGE. 
Change-Id: Icb5bb90fe3b7c31059d97d87ed8e44c0d794236e
 2015-03-23 14:23:54 -07:00
Narayan Kamath
d3b57a16b2 am 8a9dd8d1: am 05bbd6dd: Merge "Remove reference to libzipfile." 
* commit '8a9dd8d124f2b4c1d89576895057009da729a4e1':
  Remove reference to libzipfile.
 2015-03-23 10:18:20 +00:00
Narayan Kamath
8a9dd8d124 am 05bbd6dd: Merge "Remove reference to libzipfile." 
* commit '05bbd6dd357e242ec09d169d219b0b018d258f72':
  Remove reference to libzipfile.
 2015-03-23 10:10:43 +00:00
Chris Banes
f51cf635a3 Merge "TextInputLayout and Snackbar demos" into lmp-mr1-ub-dev 2015-03-23 10:01:56 +00:00
Chris Banes
2ea6b5d060 Add hide on scroll demo 
Change-Id: I1c76ad7c5f2c37a4cdfde4e73b9579ec3a633fcb
 2015-03-23 10:01:15 +00:00
Narayan Kamath
05bbd6dd35 Merge "Remove reference to libzipfile." 2015-03-23 09:58:39 +00:00
Kris Giesing
ff994c3d24 am c5ba8fc0: am 02000988: am 818a7473: Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev 
* commit 'c5ba8fc04ccf45b49270b3f0ca081f42bf1485b4':
 2015-03-21 16:20:21 +00:00
Craig Stout
30c48cd54a am 3762e5a9: am b477cc7f: am 623cfb01: Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev 
* commit '3762e5a9dc5b8952814f8ba965e20784fd585760':
 2015-03-21 16:14:08 +00:00
Craig Stout
93b9a43da5 am 5f052b26: am 4c56adc9: am 09f91e6e: Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev 
* commit '5f052b26ee338e44d2f92f550a7b4c8d19d7282f':
 2015-03-21 16:14:04 +00:00