LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,194 Commits 2 Branches 0 Tags
e88b659c2b5ad7dc142f73a5ddfe9e49c7ccb94c
Commit Graph

13194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
15fcd984ae Update media router api. 
Bug: 9380827
Change-Id: I74b5d5150336be95bd66bab35be8837c9cdf49de
 2013-06-12 14:28:17 -07:00
Xavier Ducrohet
fa1d3cae58 am 136698a4: am 8707c92b: Merge "Update the SDK API Data." into jb-mr2-dev 
* commit '136698a4ff7a46eb5d7857d1e8bd4fc1afcc8463':
  Update the SDK API Data.
 2013-06-12 11:08:42 -07:00
Xavier Ducrohet
136698a4ff am 8707c92b: Merge "Update the SDK API Data." into jb-mr2-dev 
* commit '8707c92ba3194a7d150146d144183b81cdb06fc6':
  Update the SDK API Data.
 2013-06-12 11:06:12 -07:00
Xavier Ducrohet
8707c92ba3 Merge "Update the SDK API Data." into jb-mr2-dev 2013-06-12 18:04:27 +00:00
Xavier Ducrohet
8f1a2bdf5a Update the SDK API Data. 
This is necesary for Lint to handle API 18.

Change-Id: Ida60df3f9149fdb9a4835752b1a9c3e6a3d75082
 2013-06-12 10:09:42 -07:00
The Android Automerger
3e975f4c25 merge in master-release history after reset to master 2013-06-12 07:49:49 -07:00
The Android Open Source Project
c260d03fd0 am 3ac7f611: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '3ac7f61179a97898ca5235140ad01f196d7eb0ba':
  Fix support version.
 2013-06-12 07:26:00 -07:00
The Android Open Source Project
3ac7f61179 Reconcile with jb-mr2-release - do not merge 
Change-Id: Ic207075a312c24521c5c07441dcef63100990a6b
 2013-06-12 07:23:12 -07:00
Jeff Brown
37c910f092 am ab95e666: am 972588ab: Redefine content position in milliseconds instead of seconds. 
* commit 'ab95e66679685b3316b7b28bf81eaf4756ff675f':
  Redefine content position in milliseconds instead of seconds.
 2013-06-12 00:08:38 -07:00
Jeff Brown
ab95e66679 am 972588ab: Redefine content position in milliseconds instead of seconds. 
* commit '972588aba01b2b58f20a8399ff2ab525d7b517fe':
  Redefine content position in milliseconds instead of seconds.
 2013-06-12 00:05:17 -07:00
Jeff Brown
972588aba0 Redefine content position in milliseconds instead of seconds. 
Made a note to update some other parts of the sample that need
to be fixed after other recent API changes.

Bug: 9380827
Change-Id: I23ccfa9ab434d4c7661ae379b77fa95e128513eb
 2013-06-11 18:51:17 -07:00
Jeff Brown
5fa9006b9e am ef89f3f3: am fad7c428: Update media router api. 
* commit 'ef89f3f34c0a7f57e1a51c5c58b63c7143cd3608':
  Update media router api.
 2013-06-11 18:06:03 -07:00
Jeff Brown
ef89f3f34c am fad7c428: Update media router api. 
* commit 'fad7c428e1c6c0686d34ff433a2c607b96149490':
  Update media router api.
 2013-06-11 18:03:41 -07:00
Xavier Ducrohet
e6230b8c0c Fix support version. 
Should still be 18.0.0 but looks like the schemas doesn't support this (yet?).

Change-Id: I2bf61debad74b04ea3678b3226c833abb197ca8f
 2013-06-11 17:52:30 -07:00
Robert Ly
2deefec495 make target for gms and gcm javadocs and to automate entire docs build 
Change-Id: Iea7d17782f41c91e42a244bf8c67c30b64c43ede
 2013-06-11 22:54:04 +00:00
The Android Open Source Project
638fcee790 am c8120fa1: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'c8120fa1836297f426455b83599c42e28f308574':
  Update revision of SDK component for the new release. do not merge.
 2013-06-11 15:37:01 -07:00
Xavier Ducrohet
c51474ff40 am 7f79f05d: (-s ours) am 8f92729c: Merge "Fix support version." into jb-mr2-dev 
* commit '7f79f05db952ce99d570220ad713e5938a169e6c':
  Fix support version.
 2013-06-11 15:28:35 -07:00
Ying Wang
fe1522a454 Revert "Monkey support for swipes from the sides of a device." 
This reverts commit 47937eb6b2

Change-Id: I788739c7a70132afb1f1ca13b71fff7d89ad200f
 2013-06-11 15:06:49 -07:00
The Android Open Source Project
c8120fa183 Reconcile with jb-mr2-release - do not merge 
Change-Id: I591e946be4fc393dc8e10d8dc64ba9b2c6cefe66
 2013-06-11 14:56:41 -07:00
Xavier Ducrohet
163f3440ea am ca755c14: (-s ours) am a06071bd: Merge "Update revision of SDK component for the new release. do not merge." into jb-mr2-dev 
* commit 'ca755c14c8dea329802b4ba919b1e56a34abeb5f':
  Update revision of SDK component for the new release. do not merge.
 2013-06-11 14:18:39 -07:00
Xavier Ducrohet
7f79f05db9 am 8f92729c: Merge "Fix support version." into jb-mr2-dev 
* commit '8f92729c1a6f9655ebccf4bba0d21dd25c0a5603':
  Fix support version.
 2013-06-11 14:10:20 -07:00
Xavier Ducrohet
ca755c14c8 am a06071bd: Merge "Update revision of SDK component for the new release. do not merge." into jb-mr2-dev 
* commit 'a06071bd2731f2f56a357bb0bb3b83035c14472c':
  Update revision of SDK component for the new release. do not merge.
 2013-06-11 14:10:09 -07:00
Igor Murashkin
74f1fa335b Merge "testrunner: add mediaintegrationtest" 2013-06-11 20:45:40 +00:00
Igor Murashkin
70ef9f4978 Update eclipse classpath to include mockito 
Change-Id: Id2900952f265ae4b84842f2e8838c5898fca6fe6
 2013-06-11 13:26:33 -07:00
Ying Wang
695f66a7d4 Merge "Revert "Monkey support for swipes from the sides of a device."" 2013-06-11 16:45:35 +00:00
Ying Wang
056d0a598a Revert "Monkey support for swipes from the sides of a device." 
This reverts commit 47937eb6b2

Change-Id: I788739c7a70132afb1f1ca13b71fff7d89ad200f
 2013-06-11 16:39:09 +00:00
Jeff Brown
fad7c428e1 Update media router api. 
Bug: 9380827
Change-Id: I74b5d5150336be95bd66bab35be8837c9cdf49de
 2013-06-11 00:55:32 -07:00
Xavier Ducrohet
8f92729c1a Merge "Fix support version." into jb-mr2-dev 2013-06-11 00:05:38 +00:00
Xavier Ducrohet
298c00f935 Fix support version. 
Should still be 18.0.0 but looks like the schemas doesn't support this (yet?).

Change-Id: I2bf61debad74b04ea3678b3226c833abb197ca8f
 2013-06-10 17:04:19 -07:00
Xavier Ducrohet
2fc7365d01 Update revision of SDK component for the new release. do not merge. 
Change-Id: Id48d7fa1847af58bf8d23ce127ef42b4103db74d
 2013-06-10 16:46:52 -07:00
Raphael Moll
c1f35803d2 Use prop_templates for build_tools, plat_tools & support source.properties. 
Change-Id: I49d054f55908ae63c862774f0a7dce9106bc0d7c
 2013-06-10 15:32:42 -07:00
Xavier Ducrohet
a06071bd27 Merge "Update revision of SDK component for the new release. do not merge." into jb-mr2-dev 2013-06-10 22:27:10 +00:00
Xavier Ducrohet
128ca67932 Update revision of SDK component for the new release. do not merge. 
Change-Id: Id48d7fa1847af58bf8d23ce127ef42b4103db74d
 2013-06-10 15:25:36 -07:00
Svetoslav
e8e601c4c7 Merge "Optimizing AccessibilityNodeInfo caching (Monkey)." 2013-06-07 00:07:21 +00:00
Alan Viverette
f8506eaed1 Add sample code for ExploreByTouchHelper class. 
Change-Id: Id8f0ba809746114434d553885ddfed9260bdaa45
 2013-06-06 13:03:52 -07:00
Scott Main
1791f6947c am 17169b0d: am 08557446: am 64904ff8: am 8abfd5c1: am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742 
* commit '17169b0db585add411b88874203498b327e4b49e':
  redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
 2013-06-06 12:15:41 -07:00
Scott Main
17169b0db5 am 08557446: am 64904ff8: am 8abfd5c1: am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742 
* commit '085574469889f83e5d3e7f55de3364eef56489bd':
  redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
 2013-06-06 12:13:29 -07:00
Scott Main
0855744698 am 64904ff8: am 8abfd5c1: am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742 
* commit '64904ff82332af31a1d72d635cbed0d600f6c1f1':
  redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
 2013-06-06 12:10:37 -07:00
Scott Main
64904ff823 am 8abfd5c1: am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742 
* commit '8abfd5c1b23bc6d941b38c2bff7285f9bb7a10bc':
  redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
 2013-06-06 12:09:01 -07:00
Scott Main
8abfd5c1b2 am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742 
* commit 'a0787146674c12218a5891b5c2b36a2cffb74c56':
  redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
 2013-06-06 12:07:18 -07:00
Andrew Hsieh
975fe8f94e am fecb58b4: am 38c1a99c: Merge "Fix malloc_usable_size() declaration." 
* commit 'fecb58b41d6df038506f6681b1ab2e3d9bebd484':
  Fix malloc_usable_size() declaration.
 2013-06-05 22:43:02 -07:00
Andrew Hsieh
fecb58b41d am 38c1a99c: Merge "Fix malloc_usable_size() declaration." 
* commit '38c1a99c6193e4daecc48e67fc03a35b058045ee':
  Fix malloc_usable_size() declaration.
 2013-06-05 22:36:47 -07:00
Andrew Hsieh
38c1a99c61 Merge "Fix malloc_usable_size() declaration." 2013-06-06 05:35:06 +00:00
Scott Main
a078714667 redirect all UI guideline docs to Design docs 
except for widgets, pending b/9303742

Change-Id: I9b896e6c88701044f572ab79813d43c2f34b81b9
 2013-06-05 20:46:59 -07:00
Elliott Hughes
94c272bf79 Extend the TimePickerDialog test to cover 12- and 24-hour clocks. 
Used to test https://android-review.googlesource.com/54121.

Change-Id: Ibf8418f21a7c242aac27c7e05b4990149c8305b3
 2013-06-05 16:16:04 -07:00
Svetoslav
e37f81e5a4 Optimizing AccessibilityNodeInfo caching (Monkey). 
Update monkey due to an API change.

Main change:https://googleplex-android-review.googlesource.com/#/c/316822

Change-Id: Ib945c5e977925775569f2bbd78be9c7a66267480
 2013-06-04 18:27:17 -07:00
Igor Murashkin
9fa45c021c testrunner: add mediaintegrationtest 
Bug: 9213377
Change-Id: I2fa656768ab497136a408b49831a5cbbc828947f
 2013-06-03 11:33:03 -07:00
Igor Murashkin
d8da72be61 Merge "Update eclipse classpath to include MediaFrameworkTest" 2013-06-03 18:22:03 +00:00
Yu Shan Emily Lau
e7d110635c am 4ab82c48: am 9662fbd2: Merge "Added the test def for new camera native tests." into jb-mr2-dev 
* commit '4ab82c48e97a3b45372486dae92ae1cc0e16e725':
  Added the test def for new camera native tests.
 2013-06-03 10:32:37 -07:00
Yu Shan Emily Lau
4ab82c48e9 am 9662fbd2: Merge "Added the test def for new camera native tests." into jb-mr2-dev 
* commit '9662fbd25961c3d87c9d6ea460a8a7ab292b1ed7':
  Added the test def for new camera native tests.
 2013-06-03 10:30:29 -07:00