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

725 Commits

Author SHA1 Message Date
Quddus Chong
7a11b88bcd am 6e2661f0: am 20eb8093: am 2f63207d: am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit '6e2661f086327c7ebbbda03f3387b673f0bf87df':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:56:45 +00:00
Ricardo Cervera
ffff333c19 am eeb4cf8f: am 3fee7dc7: am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit 'eeb4cf8f43797f99543db1e404066d5291da6237':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:47:05 +00:00
Quddus Chong
de0a87007b Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 2015-01-16 22:03:33 +00:00
Quddus Chong
03c15cf4c9 docs: Fixed typos in Game Controller training code snippets. 
bug: 17959906

Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27
 2015-01-16 11:36:18 -08:00
Ricardo Cervera
e229751d11 docs: Add browseable Wearable Support Lib Javadoc 
Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1
 2015-01-16 11:18:10 -08:00
Luan Nguyen
bad68bcf39 am 34a1a10d: am b47cf562: am e184b2f2: am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit '34a1a10d51af331be139849c6c0ada109bc64a63':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 22:17:50 +00:00
Luan Nguyen
d3cc11a164 docs: Remove reference to handheld app for bitmap resource locations. 
bug: 17577838
Change-Id: I54cfd7a73d21464077d8644bbe1a2d8896f745e6
 2015-01-15 09:24:09 -08:00
Ricardo Cervera
abccd9d3c9 am 5849c0e4: am 9a19ed17: am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs automerge: cb09d8d 
* commit '5849c0e4c6f8bf44de44e964ce365c0959070494':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-13 20:32:15 +00:00
Eric Gilmore
f8e8fc5fb2 am c6a22851: am 3fca2e7f: am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs automerge: 39b167a 
automerge: 85ac9f1

* commit '85ac9f153b3b1e2d1ed0c0fa571fe3dde5de8bd2':
  Adding Android Fundamentals video.
 2015-01-13 20:28:40 +00:00
Eric Gilmore
1ff978a239 am c726557c: am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs automerge: 1908515 
automerge: 979dc00

* commit '979dc00bb9061d4bf448b9880096a323d06f19dd':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-13 20:23:29 +00:00
Ricardo Cervera
afd23aba8e docs: Add parent calls to WatchFaces snippet. 
Bug: 18982021

Change-Id: I2b39255827826d1e097ccba97e90e92a587fc39b
 2015-01-12 12:54:32 -08:00
Eric Gilmore
fec824b611 Merge "Adding Android Fundamentals video." into lmp-docs 2015-01-12 17:02:32 +00:00
Eric Gilmore
46f751864b Adding Android Fundamentals video. 
Bug: 18820337
Change-Id: I758de61902f375d02219414999ea7833b5787474
 2015-01-09 13:22:59 -08:00
Eric Gilmore
1b554a3183 Removing three obsolete lessons from TOC, which in turn removes them 
from building-userinfo.jd when built.

Change-Id: If5cfbfadadb202946267ff83f665f8414875bd8c
 2015-01-07 13:35:45 -08:00
Quddus Chong
8b0250b820 am 2c9d203c: am dc1db5bf: am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 
* commit '2c9d203c4a167344bcac8dabf31eae27489214b0':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-07 10:25:53 +00:00
Joe Fernandez
597da2488a am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev 
automerge: b1c7f02

* commit 'b1c7f0215bc36b5f27d226d1fc085be99201fe7b':
  docs: Checklist for TV Apps
 2015-01-07 10:19:59 +00:00
Joe Fernandez
f4e13642c3 am 952ebe3f: am 64d74fbf: am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
automerge: 88f10a8f

* commit '88f10a8f8ef616676dbf7f0ef68df32a8b75eea8':
  docs: fix problem with TOC after Japanese pages merge
 2015-01-06 22:45:54 +00:00
David Friedman
a4a325350c am 859e176b: am aed8152d: am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
automerge: b64dea3

* commit 'b64dea3607ee12b3fd0e164b5c5fc90791bcdccd':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2015-01-06 22:44:32 +00:00
Joe Fernandez
cf973b13a9 am 9ebb780c: am 750c0385: am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
automerge: 698f155

* commit '698f1557ff32c38b76891787050c64c2e01fd794':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2015-01-06 22:41:51 +00:00
Scott Rowe
5d1a4cf68b am dfc950b4: am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
automerge: d35c1d3

* commit 'd35c1d3f47102a836d97121cb5c7f921f5022edf':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:38:43 +00:00
Andrew Solovay
ffe26c219f am eeaf280d: am ff62a5ee: am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc 
automerge: 7dd1f66

* commit '7dd1f66bb66ac9a6f6dbf2bcc2c4548b9d123491':
  docs: New "app compatibility with managed profiles" doc
 2015-01-06 20:04:03 +00:00
Quddus Chong
8a195822e2 Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs 2015-01-06 18:10:38 +00:00
Ricardo Cervera
2b2ad7ce9f am 4d4b599d: am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs 
automerge: 0281909

* commit '02819090ece2ed8ff4161a560fcb5acb8c0b9cb5':
  docs: Update wearable lists docs
 2015-01-06 02:39:22 +00:00
Sarah Maddox
041855e06d am 73c943fc: am 15e94fdf: am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs 
automerge: d259fb3

* commit 'd259fb3757f0813b3bb13dea9a65c6cab6617fc6':
  docs: Updates the request-location-updates lesson in the location APIs training course.
 2015-01-06 02:35:42 +00:00
Ricardo Cervera
509bd3a959 am fd731d4b: am fcba6472: am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs 
automerge: 2d90b49

* commit '2d90b49ad2caa3f765ed9b4b8eab31da711f4d19':
  docs: Adding vector drawables video
 2015-01-06 02:34:17 +00:00
Scott Rowe
7515d188dd docs: Checklist for TV Apps 
Change-Id: I93b57161b3e519164dab551068411f686d772596
 2015-01-05 17:50:59 -08:00
Quddus Chong
1139a0a4a2 docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. 
bug: 18759727

Change-Id: Ided6dc4f30d43f8fce252e56a6291bbb1a3d2e05
 2015-01-05 15:01:27 -08:00
Joe Fernandez
76db15a8c9 docs: fix problem with TOC after Japanese pages merge 
Change-Id: I75c78bd600907467fa81af197df216d5e6a31b1f
 2014-12-19 22:38:47 -08:00
David Friedman
58a5e3db00 Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 2014-12-20 02:04:39 +00:00
David Friedman
827cc88a33 Android TV initial (time-sensitive) localization release for Japanese partners. 
Bug: 18527238
Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2014-12-19 18:00:44 -08:00
Joe Fernandez
7cec35ef52 Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 2014-12-20 00:30:09 +00:00
Scott Rowe
ea7a71b25d docs: b/18122848 [DAC] Android TV - Recommendation card 
Change-Id: I3347254ae659e4edc7a07aa30b276bd24636db17
 2014-12-19 16:11:58 -08:00
Scott Rowe
e2b44f86b9 docs: Making TV Apps Searchable - new training 
Change-Id: I188c14789c9ba36a35d0c2d07b349ac301837a48
 2014-12-19 15:15:04 -08:00
Andrew Solovay
713cd74e33 docs: New "app compatibility with managed profiles" doc 
Doc on steps app developers can take to make sure their apps will
behave properly in a managed-profile environment. Doesn't talk about
unreleased features, this is intended to go live on DAC in December.

See first comment for doc stage location.

Change-Id: I82e17e6085f732096e2aff40fea52d3ddafcf3ee
 2014-12-19 13:31:34 -08:00
Ricardo Cervera
60cfb01a46 Merge "docs: Update wearable lists docs" into lmp-docs 2014-12-18 22:23:27 +00:00
Ricardo Cervera
85f69885f7 docs: Update wearable lists docs 
Bug: 18791586

Change-Id: I83824c67b46ac18944905751d0c8d09a0a5577ae
 2014-12-18 13:13:59 -08:00
Sarah Maddox
ca23a587a3 Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs 2014-12-18 19:42:36 +00:00
Sarah Maddox
a4ad770f82 docs: Updates the request-location-updates lesson in the location APIs training course. 
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Updates the entire tutorial and code sample for clarity and correctness.

Bug: 17109822
Change-Id: I42cc36f861d0455ef9c07b793c64038c572a6e8a
 2014-12-19 06:04:07 +11:00
Ricardo Cervera
276a324cd6 docs: Adding vector drawables video 
Change-Id: I6ea0e4fd3afb7c6d2e9ba314a92fe8e0128af42e
 2014-12-18 09:49:56 -08:00
Eric Gilmore
6b1ecbea31 am 2195f583: am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. automerge: 8d2af0f automerge: 65e7a2b 
automerge: 982e5eb

* commit '982e5eb3655f20608c1ae492c4366f2fb35cdd2c':
  Adding links for the last few files requested by PMs.
 2014-12-18 02:02:41 +00:00
Eric Gilmore
fe7b93f4f7 Adding links for the last few files requested by PMs. 
Change-Id: If93e894a690ee5bef4b59caa234a97e3f0f7f6e4
 2014-12-17 15:46:37 -08:00
Sarah Maddox
2f39dd777f am 91a41ac1: am 99c5ac9e: am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs automerge: 8f0f627 
* commit '91a41ac173b2515bbd110ab3bfc0f95bc25bfc8e':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 11:02:44 +00:00
Sarah Maddox
65dc25da3f docs: Updates lesson 1 of location API training: Get last-known location. 
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Updates the entire tutorial and code sample for clarity and correctness.

Bug: 17109822
Change-Id: I759a184a72d50702030b898a5f2e240cd3bdf4be
 2014-12-15 16:55:36 +11:00
Narayan Kamath
93bb5419aa Merge "Remove references to apache-http from various documents." 2014-12-12 14:56:44 +00:00
Narayan Kamath
56eb989791 Remove references to apache-http from various documents. 
Most of them are pointless links to a "text/plain" constant which are
far clearer when inlined with the relevant text.

Change-Id: Iaed51b4548cb2836741106dc19c9cf500c205d32
 2014-12-12 14:55:18 +00:00
Ricardo Cervera
dd4b92b3fa am c0276ebd: am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs automerge: 575c8c9 
* commit 'c0276ebd93554b9c3bfde2587b00ca79afa6ed05':
  docs: Fixes to watch faces docs.
 2014-12-12 04:25:54 +00:00
Ricardo Cervera
9fe34d9037 Merge "docs: Fixes to watch faces docs." into lmp-docs 2014-12-11 19:28:41 +00:00
Ricardo Cervera
ad69082b50 docs: Fixes to watch faces docs. 
Bug: 18705470
Bug: 18702859
Bug: 18713266

Change-Id: I67f159f3b54a03f08aa1cd4bf3aa40eec4a34631
 2014-12-11 09:17:45 -08:00
smain@google.com
984972fadc am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc automerge: bac113b 
automerge: c73a65d

* commit 'c73a65d61892542ece0dd9b95000048517f36c02':
  add helpouts widget to wave 3 pages
 2014-12-11 10:21:47 +00:00
Ricardo Cervera
c07bbcb37c am fc1e25f3: am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs automerge: a41a241 
* commit 'fc1e25f30deac9f148add51875f92ef4ff473527':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 21:58:28 +00:00