LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,040 Commits 2 Branches 0 Tags
54723fb6ac38cbefd2dbaf8c1e7a892765170d4c
Commit Graph

12040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
ecd39491d7 am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit 'c3e7bbaf00207bf36a2082cece68f7d6c0bf94af':
  make target for gms and gcm javadocs and to automate entire docs build
 2013-06-13 15:40:32 -07:00
Robert Ly
2336733e7c am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '0e7706f3071b1edc4bd0af673c0ac44cbfe0cd71':
 2013-06-13 15:37:06 -07:00
Robert Ly
c3e7bbaf00 am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '128c2f0265307ef5f36bd073148b46ef545db1c2':
  make target for gms and gcm javadocs and to automate entire docs build
 2013-06-13 15:36:30 -07:00
Robert Ly
0e7706f307 am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '128c2f0265307ef5f36bd073148b46ef545db1c2':
  make target for gms and gcm javadocs and to automate entire docs build
 2013-06-13 15:35:55 -07:00
Robert Ly
128c2f0265 am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '2deefec495526a521f16e4c0d6e19f2969462199':
  make target for gms and gcm javadocs and to automate entire docs build
 2013-06-13 15:34:14 -07:00
Elliott Hughes
532fc97091 am 34a5e96b: am 070228fa: Merge "Extend the TimePickerDialog test to cover 12- and 24-hour clocks." 
* commit '34a5e96b210af65c61f17052445fc7eb17b43ab9':
  Extend the TimePickerDialog test to cover 12- and 24-hour clocks.
 2013-06-13 10:22:32 -07:00
Elliott Hughes
34a5e96b21 am 070228fa: Merge "Extend the TimePickerDialog test to cover 12- and 24-hour clocks." 
* commit '070228fa263678b906d845039a314f2ec45f52e0':
  Extend the TimePickerDialog test to cover 12- and 24-hour clocks.
 2013-06-13 10:21:35 -07:00
Elliott Hughes
070228fa26 Merge "Extend the TimePickerDialog test to cover 12- and 24-hour clocks." 2013-06-13 17:19:31 +00:00
The Android Open Source Project
e14bee15e5 Reconcile with jb-mr2-release - do not merge 
Change-Id: I61c2e7abaae34978e88c581f67e72bf45d4ebafb
 2013-06-12 18:04:01 -07:00
Jeff Brown
9fe3f5e3b0 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-12 17:06:27 -07:00
Xavier Ducrohet
ec0f8c20c6 Update the SDK API Data. 
This is necesary for Lint to handle API 18.

Change-Id: Ida60df3f9149fdb9a4835752b1a9c3e6a3d75082
 2013-06-12 14:28:33 -07:00
Jeff Brown
15fcd984ae Update media router api. 
Bug: 9380827
Change-Id: I74b5d5150336be95bd66bab35be8837c9cdf49de
 2013-06-12 14:28:17 -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 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
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
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
c8120fa183 Reconcile with jb-mr2-release - do not merge 
Change-Id: I591e946be4fc393dc8e10d8dc64ba9b2c6cefe66
 2013-06-11 14:56:41 -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
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
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
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
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
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
Yu Shan Emily Lau
9662fbd259 Merge "Added the test def for new camera native tests." into jb-mr2-dev 2013-06-03 17:28:22 +00:00
Jeff Brown
abd8491b52 am 998bd113: Update media router API. 
* commit '998bd1138ace7eab7452ef3e4fab1518e0193902':
  Update media router API.
 2013-06-01 08:23:33 -07:00
Jeff Brown
998bd1138a Update media router API. 
Bug: 9210033
Change-Id: I11a3bb3691096cdea60823d92245cbf86770f23b
 2013-05-30 19:23:15 -07:00
Jeff Sharkey
0f79198b69 am 1cfd5ec3: am 924470b1: Merge "Bring libdvm into default classpath." 
* commit '1cfd5ec3328ef7e66ca8481da036e36f0a3a3074':
  Bring libdvm into default classpath.
 2013-05-30 16:59:01 -07:00
Ben Cheng
8380edf129 am 4cd394f4: am 2aa19124: Merge "New tutorial app for DDMS native heap tracker." 
* commit '4cd394f4f76858840dc635bb2a952001880cd4d2':
  New tutorial app for DDMS native heap tracker.
 2013-05-30 16:59:00 -07:00
Jeff Sharkey
1cfd5ec332 am 924470b1: Merge "Bring libdvm into default classpath." 
* commit '924470b1031c7e10a2989bad14eeff0da7e77394':
  Bring libdvm into default classpath.
 2013-05-30 16:54:25 -07:00
Ben Cheng
4cd394f4f7 am 2aa19124: Merge "New tutorial app for DDMS native heap tracker." 
* commit '2aa19124453df6f3394d1dcd984e05dca86f1346':
  New tutorial app for DDMS native heap tracker.
 2013-05-30 16:54:20 -07:00
Jean-Baptiste Queru
92ffcc4d83 Merge "Update copyright/license templates." into jb-mr2-dev-plus-aosp 2013-05-30 22:39:56 +00:00
Chet Haase
802dfb9b8d am cdf654b5: am 9079a04c: am 829b544e: am f04a0b09: am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos 
* commit 'cdf654b5300407db2215a038ed902b29bb29ae7c':
 2013-05-30 15:16:46 -07:00
Chet Haase
cdf654b530 am 9079a04c: am 829b544e: am f04a0b09: am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos 
* commit '9079a04c9ec614d8be81827d133dca9e91f561d7':
 2013-05-30 15:14:30 -07:00
Jeff Sharkey
b89090c2a7 am d1c2d376: am 29ca053a: am 0ea348a5: am 39ffbccd: Generalize support library tests. 
* commit 'd1c2d376c9daf570beec8cb9bb751ceb348d08e2':
  Generalize support library tests.
 2013-05-30 15:13:12 -07:00