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

16393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dake Gu
0058c9326f am f96ced67: am 3cc97974: am 2dbbfbbf: Merge "Add RowsFragment example" into lmp-mr1-dev 
* commit 'f96ced677150d5629694015dd7870507e0cdc985':
  Add RowsFragment example
 2014-12-10 21:56:03 +00:00
Dake Gu
f96ced6771 am 3cc97974: am 2dbbfbbf: Merge "Add RowsFragment example" into lmp-mr1-dev 
* commit '3cc979745c86d9b32dc96d04ffbb5f233fa45155':
  Add RowsFragment example
 2014-12-10 03:32:43 +00:00
Andrew Hsieh
38f3e25b8f am 1e754556: am e5ede93a: Merge "Header/symbol for unknown arch." 
* commit '1e7545563715492251509916ca2133337e0da174':
  Header/symbol for unknown arch.
 2014-12-09 23:45:32 +00:00
Dake Gu
3cc979745c am 2dbbfbbf: Merge "Add RowsFragment example" into lmp-mr1-dev 
* commit '2dbbfbbffaeb343f6d25021b8d9148ca48cd5f5a':
  Add RowsFragment example
 2014-12-09 23:27:27 +00:00
Craig Stout
33dfbf57ed am 9411b618: am 153dc4d3: am e2f3892f: Merge "Add \'Remove all then re-add\'." into lmp-mr1-dev 
* commit '9411b61877d1a7416ae00f16bd359a963dc948ed':
  Add 'Remove all then re-add'.
 2014-12-09 23:22:02 +00:00
Dake Gu
2dbbfbbffa Merge "Add RowsFragment example" into lmp-mr1-dev 2014-12-09 23:19:34 +00:00
Dake Gu
72ae1d3818 Add RowsFragment example 
Bug: 18622128
Change-Id: I12146a766fa383782f9917352c5959b6064835ee
 2014-12-09 14:50:01 -08:00
Andrew Hsieh
1e75455637 am e5ede93a: Merge "Header/symbol for unknown arch." 
* commit 'e5ede93a47885b9ac9d0ccb72c0ef4ad0d655547':
  Header/symbol for unknown arch.
 2014-12-09 15:03:22 +00:00
Andrew Hsieh
e5ede93a47 Merge "Header/symbol for unknown arch." 2014-12-09 02:50:43 +00:00
WenHan Gu
d7120d4451 Header/symbol for unknown arch. 
Change-Id: Ibdbc4cf5408958444ed7a83da6c8bbe478072c6d
 2014-12-09 10:50:05 +08:00
Xavier Ducrohet
4c6c7e0043 am 7bd9087b: (-s ours) am efa7ff93: am 032b355a: am b0bedfe4: am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE. 
* commit '7bd9087b6c1d847199ffc609af9b60c45e91e28f':
  Update support extra version to 21.0.3 DO NOT MERGE.
 2014-12-09 00:58:56 +00:00
RoboErik
2ef47492cc am 2a256b9f: am ee0da246: am 4424852b: Updates for compatLib changes to MedaiRouter support lib 
* commit '2a256b9feda45468558e1fa4d04c8f14f6ce351b':
  Updates for compatLib changes to MedaiRouter support lib
 2014-12-09 00:56:48 +00:00
Craig Stout
9411b61877 am 153dc4d3: am e2f3892f: Merge "Add \'Remove all then re-add\'." into lmp-mr1-dev 
* commit '153dc4d3b7021d63c8595efa5bcc06519498b319':
  Add 'Remove all then re-add'.
 2014-12-09 00:49:19 +00:00
Craig Stout
153dc4d3b7 am e2f3892f: Merge "Add \'Remove all then re-add\'." into lmp-mr1-dev 
* commit 'e2f3892fcbf59c54deb38287b20b4083a3f324ca':
  Add 'Remove all then re-add'.
 2014-12-09 00:42:28 +00:00
Craig Stout
e2f3892fcb Merge "Add 'Remove all then re-add'." into lmp-mr1-dev 2014-12-09 00:34:22 +00:00
Craig Stout
1b6ad39042 Add 'Remove all then re-add'. 
Change-Id: I57f06fab207bcf47c1fd089bf720f539aa389e7e
 2014-12-08 16:09:31 -08:00
Andrew Hsieh
babbb66c55 am 3835e78d: am 08b75cc3: Merge "misc header changes for r10d" 
* commit '3835e78ddb791e1f3740dae0a0aca7b7cf97f8fe':
  misc header changes for r10d
 2014-12-08 20:28:43 +00:00
Xavier Ducrohet
7bd9087b6c am efa7ff93: am 032b355a: am b0bedfe4: am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE. 
* commit 'efa7ff93f1e11b09321fa51a46df2f7820ba6db8':
  Update support extra version to 21.0.3 DO NOT MERGE.
 2014-12-08 19:35:39 +00:00
RoboErik
2a256b9fed am ee0da246: am 4424852b: Updates for compatLib changes to MedaiRouter support lib 
* commit 'ee0da246cd87f91ab8229e78cb9d65508fb9ebda':
  Updates for compatLib changes to MedaiRouter support lib
 2014-12-08 19:18:28 +00:00
Andrew Hsieh
3835e78ddb am 08b75cc3: Merge "misc header changes for r10d" 
* commit '08b75cc3b7ccec1b2eb7d78d5bb49049490f3a37':
  misc header changes for r10d
 2014-12-08 19:06:37 +00:00
Andrew Hsieh
08b75cc3b7 Merge "misc header changes for r10d" 2014-12-08 02:33:22 +00:00
Xavier Ducrohet
efa7ff93f1 am 032b355a: am b0bedfe4: am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE. 
* commit '032b355a137307839dfe2b098cd208f00ba4ce15':
  Update support extra version to 21.0.3 DO NOT MERGE.
 2014-12-05 23:58:29 +00:00
Xavier Ducrohet
032b355a13 am b0bedfe4: am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE. 
* commit 'b0bedfe4b75af178609525834710a89137dca988':
  Update support extra version to 21.0.3 DO NOT MERGE.
 2014-12-05 23:53:01 +00:00
Xavier Ducrohet
b0bedfe4b7 am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE. 
* commit '53c3c2e56ee3ff234eb13362cfbf74203c9334d2':
  Update support extra version to 21.0.3 DO NOT MERGE.
 2014-12-05 23:45:57 +00:00
Xavier Ducrohet
53c3c2e56e Update support extra version to 21.0.3 DO NOT MERGE. 
Change-Id: Id78466d1ef53a303a53bf7b92ed1d290b1b55008
 2014-12-05 15:38:39 -08:00
RoboErik
ee0da246cd am 4424852b: Updates for compatLib changes to MedaiRouter support lib 
* commit '4424852bbb6e9fd2b3e078cd54b73f6a4ea56a26':
  Updates for compatLib changes to MedaiRouter support lib
 2014-12-05 22:19:52 +00:00
Yohann Roussel
c5ed3d9628 Merge "Declare target to allow compilation to Jack files." 2014-12-05 09:21:34 +00:00
Andrew Hsieh
6aff78a6ce misc header changes for r10d 
1. move sgidefs.h to libc/arch-mips.
   See bionic 6e50cb454451916ced315680f6c13dc08cf3959a
2. change type of u_ar0 from "unsigned long" to "struct user_regs_struct*".
   See bionic e03950fa0c5567edf70d011b856a027e03b1c0f7
3. sync fts.h, dlext.h, sys/user.h
4. remove ' from string.h

Change-Id: I2ba58b0df4c655f107ea086efbd0220de2b40e9a
 2014-12-05 14:11:54 +08:00
RoboErik
4424852bbb Updates for compatLib changes to MedaiRouter support lib 
The ControllerDialog in MediaRouter now gets the session token from
the MediaRouter instead of needing it to be set. Removed the calls to
set it directly on the dialog.

bug:18186638
Change-Id: If7499108c226d3405ea70e2f332694a92a921e50
 2014-12-04 13:51:26 -08:00
Deepanshu Gupta
e4067e0dad am 0407e185: am 9247e323: am 154cfd7a: am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev 
* commit '0407e185d7ff7e46f735f9be739096daaf3625d3':
  Add tzdata to SDK build
 2014-12-04 20:45:52 +00:00
Craig Stout
f0734ac87e am b77130e3: am e5c52cd4: am f4858169: Use non-deprecated HeaderItem constructor. 
* commit 'b77130e39b8c475947a123f7e920f9d4594b4be2':
  Use non-deprecated HeaderItem constructor.
 2014-12-04 20:45:50 +00:00
Deepanshu Gupta
0407e185d7 am 9247e323: am 154cfd7a: am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev 
* commit '9247e32376b0f1d715f176317d15e9c1f1fdc34a':
  Add tzdata to SDK build
 2014-12-04 20:25:39 +00:00
Craig Stout
b77130e39b am e5c52cd4: am f4858169: Use non-deprecated HeaderItem constructor. 
* commit 'e5c52cd4badee3588dfa0d2a30aade3449422589':
  Use non-deprecated HeaderItem constructor.
 2014-12-04 20:25:25 +00:00
RoboErik
dd6fa14f94 am 7604b23c: am 9bf62048: am d7e30037: Merge "Update for MediaSessionCompat support" into lmp-mr1-dev 
* commit '7604b23cec35c40185397bbaa09b488562dfe5d0':
  Update for MediaSessionCompat support
 2014-12-04 16:16:06 +00:00
Deepanshu Gupta
9247e32376 am 154cfd7a: am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev 
* commit '154cfd7a55e432f38c2550cecc2e142fd8d8d782':
  Add tzdata to SDK build
 2014-12-04 14:54:03 +00:00
Craig Stout
e5c52cd4ba am f4858169: Use non-deprecated HeaderItem constructor. 
* commit 'f48581698cdf07afb99918151a11309257838f5b':
  Use non-deprecated HeaderItem constructor.
 2014-12-04 14:54:01 +00:00
Deepanshu Gupta
154cfd7a55 am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev 
* commit '7dd11bd0664f7e43c049eba632e390451ddeb64d':
  Add tzdata to SDK build
 2014-12-04 02:56:53 +00:00
Craig Stout
f48581698c Use non-deprecated HeaderItem constructor. 
b/17455376

Change-Id: I9fff76367ffe1f96642a39962e51c935cf39d10b
 2014-12-03 17:11:57 -08:00
Deepanshu Gupta
7dd11bd066 am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev 
* commit 'ca15c4153285d2eb587b0d026c47f57ff36d2fe1':
  Add tzdata to SDK build
 2014-12-03 20:58:16 +00:00
Deepanshu Gupta
ca15c41532 Merge "Add tzdata to SDK build" into lmp-dev 2014-12-03 20:48:30 +00:00
RoboErik
7604b23cec am 9bf62048: am d7e30037: Merge "Update for MediaSessionCompat support" into lmp-mr1-dev 
* commit '9bf620484bcd12fa9a4da605d5263840eeec0758':
  Update for MediaSessionCompat support
 2014-12-03 20:44:08 +00:00
RoboErik
9bf620484b am d7e30037: Merge "Update for MediaSessionCompat support" into lmp-mr1-dev 
* commit 'd7e30037aa719f43d74bb1f706f2df480168e7d0':
  Update for MediaSessionCompat support
 2014-12-03 19:50:01 +00:00
Marco Nelissen
1afdaba4e4 Increase install time timeout 
The media CTS test apk is quite large, causing installation to often
take (much) longer than the 20 second timeout that runtest uses.
Increasing it to 60 seconds fixes the issue.

Change-Id: I43cc1e094a29f8b1bd18e8f27ff53e183664f2bb
 2014-12-03 11:27:55 -08:00
RoboErik
d7e30037aa Merge "Update for MediaSessionCompat support" into lmp-mr1-dev 2014-12-03 19:06:05 +00:00
Michael Wright
9c9f8113b4 am 7dda1047: am e9860761: am 2503a62b: Merge "Have the MediaProjection sample use the callback." into lmp-mr1-dev 
* commit '7dda1047dd14cebd9099b3ba848064ff3721cc3d':
  Have the MediaProjection sample use the callback.
 2014-12-03 03:00:29 +00:00
Michael Wright
7dda1047dd am e9860761: am 2503a62b: Merge "Have the MediaProjection sample use the callback." into lmp-mr1-dev 
* commit 'e98607612927716a2b3730702f056528d5fd6b29':
  Have the MediaProjection sample use the callback.
 2014-12-03 02:51:51 +00:00
Michael Wright
e986076129 am 2503a62b: Merge "Have the MediaProjection sample use the callback." into lmp-mr1-dev 
* commit '2503a62bc3dfda20a81d1e762f68981b8963c678':
  Have the MediaProjection sample use the callback.
 2014-12-03 02:17:14 +00:00
Michael Wright
2503a62bc3 Merge "Have the MediaProjection sample use the callback." into lmp-mr1-dev 2014-12-03 01:18:26 +00:00
Trevor Johns
5ab29051f1 am c0fa2ee4: (-s ours) am 64a7d19f: am 22ca6ce4: am 15af151e: am f20b9979: am 1ccf8350: DO NOT MERGE: Update revision number for Android Samples package (lmp-docs) 
* commit 'c0fa2ee425bcd6aad9d2d0fd9f29b81e5286ff6e':
  DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
 2014-12-01 23:30:32 +00:00
Trevor Johns
c0fa2ee425 am 64a7d19f: am 22ca6ce4: am 15af151e: am f20b9979: am 1ccf8350: DO NOT MERGE: Update revision number for Android Samples package (lmp-docs) 
* commit '64a7d19f92a2b2a5c13564d4e4572af13ef128ab':
  DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
 2014-12-01 23:24:37 +00:00