drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,259 Commits 1 Branch 0 Tags
Commit Graph

6468 Commits

Author SHA1 Message Date
Scott Main
897739f1b7 Merge "Revert "add Cast to the sidenav"" into klp-docs 2014-01-30 21:27:26 +00:00
Scott Main
1ff3e4fffc Revert "add Cast to the sidenav" 
This reverts commit 3781318fefba28699e7713b231c9591bf29eadac.

Change-Id: Iacefcd9a9d1f678d7a16f2bcdaac4c6cc90a475d
 2014-01-30 21:27:06 +00:00
Scott Main
428ccea509 Merge "Revert "add google cast feature page"" into klp-docs 2014-01-30 21:24:45 +00:00
Scott Main
eae9f4675e Revert "add google cast feature page" 
This reverts commit cf010ab9c5df8896c57a722137ac3b4306ef1ca5.

Change-Id: I87197ce3c4f65ae8899bbf081cb4c0e84e4f1684
 2014-01-30 21:24:25 +00:00
Quddus Chong
bcf8faa6c7 am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs 
* commit 'f29e2589a440e73d9dea1a6c9c7aed1c5a3002f2':
  Revert "docs: Added API reference docs for GCore Iberico release."
 2014-01-30 19:36:07 +00:00
Quddus Chong
583e0b2c0e Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs 2014-01-30 19:31:05 +00:00
Quddus Chong
0c8b53a25b Revert "docs: Added API reference docs for GCore Iberico release." 
This reverts commit 32993c68fff5cb229c8503ffe0fad06b53189377.

Change-Id: I8eab48ae260a3289ae0d4c0a131d80a1fd1a5316
 2014-01-30 19:03:16 +00:00
Scott Main
396954b5a5 am 84dabc75: am 500db2fe: am 55330921: am 8b6fa56f: am c1ae12b7: update android studio download to 0.4.2 
* commit '84dabc75daf3045cc5d59971112589d32972f3b1':
  update android studio download to 0.4.2
 2014-01-30 18:15:43 +00:00
Scott Main
55330921c9 am 8b6fa56f: am c1ae12b7: update android studio download to 0.4.2 
* commit '8b6fa56f5cdb66ed1bafb7920ba8299ee8b3034a':
  update android studio download to 0.4.2
 2014-01-30 18:06:44 +00:00
Scott Main
c1ae12b7d8 update android studio download to 0.4.2 
Change-Id: Icf789bb6a2cfb254b25e865e2a60ec4717887afa
 2014-01-30 09:02:25 -08:00
Scott Main
015d67f449 am 959c5d5e: am ec20f347: am 46cf9087: am e49346dc: am eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs 
* commit '959c5d5ef9be28a054b6dd61a9f660dfe967351b':
  Revert "add warning to all the new iberico API pages about SDK not available yet"
 2014-01-30 16:55:04 +00:00
Scott Main
7874b53c4e am fb6f1e39: am 599bb934: am 759c6305: am 0d9f5b64: am e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs 
* commit 'fb6f1e390100c292ad305a97f1af31f9d20f0dd4':
  Revert "add api notice to cast package index"
 2014-01-30 16:54:56 +00:00
Scott Main
c22327c2a6 am cbc8a872: am 648729ad: am 540306be: am eee01505: am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs 
* commit 'cbc8a872cc7bbf3bb6d64b262b070e6321644bcc':
  Revert "add api notice to a bunch more files in iberico release"
 2014-01-30 16:50:53 +00:00
Scott Main
46cf90878e am e49346dc: am eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs 
* commit 'e49346dcb213cc96f910c798e4aa00688197af9a':
  Revert "add warning to all the new iberico API pages about SDK not available yet"
 2014-01-30 16:42:44 +00:00
Scott Main
759c6305b2 am 0d9f5b64: am e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs 
* commit '0d9f5b640c31a5bce699419a93a98acef1471db7':
  Revert "add api notice to cast package index"
 2014-01-30 16:38:46 +00:00
Scott Main
540306be15 am eee01505: am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs 
* commit 'eee015057a2abfaef2ac7360a5536605e7d74e05':
  Revert "add api notice to a bunch more files in iberico release"
 2014-01-30 16:34:52 +00:00
Scott Main
eb35de00de Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs 2014-01-30 16:34:26 +00:00
Scott Main
5a6c979c80 Revert "add warning to all the new iberico API pages about SDK not available yet" 
This reverts commit e724990230d267c13f8f820b5fdbe7c58b25d344.

Change-Id: I1415bf9542b01b57b1802115466288ec93ab6987
 2014-01-30 16:33:50 +00:00
Scott Main
e627eaeebe Merge "Revert "add api notice to cast package index"" into klp-docs 2014-01-30 16:31:44 +00:00
Scott Main
f6617d0fa7 Revert "add api notice to cast package index" 
This reverts commit 845bcc6d344765a0ea7cfcf0b4ac398774d06f94.

Change-Id: I07b047f1b44e8b9b32bb4b36b6f858cdef9fed9e
 2014-01-30 16:28:27 +00:00
Scott Main
36d7dfb7e8 Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs 2014-01-30 16:26:21 +00:00
Scott Main
df2cb1e521 Revert "add api notice to a bunch more files in iberico release" 
This reverts commit c62223a04d15da4240129a9b05ad0be965f08ee4.

Change-Id: If3cee4062e2f48a3c1e365f025701e6d1de9c9d4
 2014-01-30 16:25:38 +00:00
Adam Koch
268d7ad329 am 310b1e51: am af5b2d3f: am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs 
* commit '310b1e511f92c6972ccda2c7a779116fc0f89ced':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659
 2014-01-30 01:58:22 +00:00
Adam Koch
6e1ce75f4c am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs 
* commit 'b430d93b058a706be731e45f8c1836d97219a666':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659
 2014-01-29 23:09:58 +00:00
Adam Koch
cb3ea3d474 Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs 2014-01-29 23:04:05 +00:00
Scott Main
0b4e9b674f am 3e35a2c3: am 5a0b40d4: am f088add7: am 80cbc73f: am e535499e: Merge "add api notice to cast package index" into klp-docs 
* commit '3e35a2c3b702777527da74e4672bddd1f593a1c9':
  add api notice to cast package index
 2014-01-29 12:49:51 +00:00
Scott Main
99fec5df7f am 6fe01375: am d50aaefd: am 66c82a8a: am 28c42122: am c62223a0: add api notice to a bunch more files in iberico release 
* commit '6fe01375532d11d4fd710b4d7c7d0899ed6f548e':
  add api notice to a bunch more files in iberico release
 2014-01-29 12:49:45 +00:00
Scott Main
ab3269ad4c am 03cc03a3: am f81a02a3: am 9cc6eb7b: am da59b9c1: am e7249902: add warning to all the new iberico API pages about SDK not available yet 
* commit '03cc03a32c0cfa5368903d389c102baa129c6da9':
  add warning to all the new iberico API pages about SDK not available yet
 2014-01-29 12:49:38 +00:00
quddusc
913d15460e am 517b322f: am 299cd65e: am c73d1d4a: am c4cba0e9: am 32993c68: docs: Added API reference docs for GCore Iberico release. 
* commit '517b322f091bdbfb8b82c0d57895f20b95fee6a3':
  docs: Added API reference docs for GCore Iberico release.
 2014-01-29 12:49:22 +00:00
Scott Main
be3056050d am ee209289: am dd5b4cc9: am 3b9b40f7: am 31db1bba: am cf010ab9: add google cast feature page 
* commit 'ee20928913889eace0388f348c09f1f801272fd6':
  add google cast feature page
 2014-01-29 12:49:15 +00:00
Scott Main
1406a2203f am 92424e46: am 66b6ae35: am c510adb7: am 2d27da36: am 3781318f: add Cast to the sidenav 
* commit '92424e46ef6247e78c31d0f3dc68b62c78d12117':
  add Cast to the sidenav
 2014-01-29 12:20:54 +00:00
Scott Main
f088add7f2 am 80cbc73f: am e535499e: Merge "add api notice to cast package index" into klp-docs 
* commit '80cbc73f657cc6ac5db8bb5529918e9e05edc749':
  add api notice to cast package index
 2014-01-29 08:24:34 +00:00
Scott Main
66c82a8a8e am 28c42122: am c62223a0: add api notice to a bunch more files in iberico release 
* commit '28c4212223a033cc65e5b2d8029527d5cb4b40a9':
  add api notice to a bunch more files in iberico release
 2014-01-29 08:24:28 +00:00
Scott Main
e535499ec3 Merge "add api notice to cast package index" into klp-docs 2014-01-29 08:15:12 +00:00
Scott Main
9cc6eb7bea am da59b9c1: am e7249902: add warning to all the new iberico API pages about SDK not available yet 
* commit 'da59b9c1a8b1e5866ab884fe498838b7d91b55a6':
  add warning to all the new iberico API pages about SDK not available yet
 2014-01-29 07:52:23 +00:00
quddusc
c73d1d4a17 am c4cba0e9: am 32993c68: docs: Added API reference docs for GCore Iberico release. 
* commit 'c4cba0e991596d524a5a85e66ea3a8dd65f5cef5':
  docs: Added API reference docs for GCore Iberico release.
 2014-01-29 07:52:12 +00:00
Scott Main
c62223a04d add api notice to a bunch more files in iberico release 
Change-Id: Ia260aa4bcb2f46cfeff1478f951c04951ad542a6
 2014-01-28 23:02:13 -08:00
Scott Main
845bcc6d34 add api notice to cast package index 
Change-Id: Ie5859576540b8ff12eb97c333e053eb637f21f0d
 2014-01-28 21:58:39 -08:00
Scott Main
e724990230 add warning to all the new iberico API pages about SDK not available yet 
Change-Id: Idcfc470e0ae8fdd4bbaec8bedf6cfd50dbcc74b7
 2014-01-28 21:20:36 -08:00
quddusc
32993c68ff docs: Added API reference docs for GCore Iberico release. 
Change-Id: Ic8816e44aa578c258fef91bf93873b698ac4090e
 2014-01-29 04:26:07 +00:00
Scott Main
3b9b40f712 am 31db1bba: am cf010ab9: add google cast feature page 
* commit '31db1bbaa1f69600fe82b4691717772d08785364':
  add google cast feature page
 2014-01-29 04:05:24 +00:00
Scott Main
cf010ab9c5 add google cast feature page 
Change-Id: Ie46b8ecdccea5ab3069176d15562d69aacc2d831
 2014-01-28 19:54:46 -08:00
Adam Koch
a816db990c Doc fix: Update code snippet in displaying bitmaps training class 
Bug: 12715659

Change-Id: I33ad0ae04ff8855a3fc09a312830e0277dcfe70d
 2014-01-29 14:52:28 +11:00
Scott Main
c510adb7e6 am 2d27da36: am 3781318f: add Cast to the sidenav 
* commit '2d27da36489668d2fedce0bbdcfe50e96206bdd1':
  add Cast to the sidenav
 2014-01-29 00:06:11 +00:00
Scott Main
3781318fef add Cast to the sidenav 
Change-Id: I7bb04e523363ad4964eb5bef405d9e2e4456e2d0
 2014-01-28 15:58:48 -08:00
Dirk Dougherty
94ac4f6855 Add samples TOC generated from browsable sources. 
(cherry picked from commit 1c64e2f429bfc97fcf64ebeaa0b3aa2d6b609a1d)

Change-Id: I085b68646565bbf904e70734008efe5cc9f21eda
 2014-01-23 00:28:35 +00:00
quddusc
afc4deb7b3 am ddef0ec9: am fbb2a975: am c99557c9: am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit 'ddef0ec94b01b18f4452dea7ed98a4ff5184e49b':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-22 05:56:16 +00:00
quddusc
c99557c92c am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit '0cb965a69aac9c2a83798960a0efeaa6e596e445':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-21 20:13:48 -08:00
quddusc
0cb965a69a am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit '5020a8736f3319d295d31bed421f837788878451':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-22 04:10:13 +00:00
quddusc
5020a8736f Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 2014-01-22 04:07:18 +00:00