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

8719 Commits

Author SHA1 Message Date
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
Joe Fernandez
217d145d49 Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 2015-01-16 21:58:37 +00:00
Rich Slogar
8f93abeb60 docs: adding studio-sample-in-editor.png file 
Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505
 2015-01-16 12:26:20 -08:00
Joe Fernandez
fadcbc705f am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit 'b7ac4dff3d97865cde5d6876d30dde0a77848f25':
  docs: studio disk space requirements typo
 2015-01-16 19:55:52 +00:00
Joe Fernandez
478d4e86ff am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit '0b596de9a4cc9b8d0694838f4b699c722d448bac':
  docs: link to sdk manager
 2015-01-16 19:51:08 +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
Joe Fernandez
8304b8b9ce Merge "docs: studio disk space requirements typo" into lmp-docs 2015-01-16 18:49:28 +00:00
Joe Fernandez
c84021ba99 Merge "docs: link to sdk manager" into lmp-docs 2015-01-16 18:47:54 +00:00
Ricardo Cervera
90312d808f am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:36:45 +00:00
Rich Slogar
8a7f20f5a4 am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs 
* commit 'b43a7eefb75b2a6397d738055389567e1faa21d9':
  docs: studio support library revisions update
 2015-01-16 18:03:41 +00:00
Dirk Dougherty
f83ae5cd59 am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 
* commit '7b7f074f282e551439b0b3c40a4ccb44d2981006':
  Doc change: Add new analytics information to Distribute.
 2015-01-16 18:03:36 +00:00
Rich Slogar
a84faf0f15 am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs 
* commit '3505303a3aa113058bca58a1cdf3c84449b6712e':
  docs: build link update
 2015-01-16 18:03:32 +00:00
Rich Slogar
ab8a5a0ea8 am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs 
* commit 'f1feda36fbaebf22bf3e06d05ae186ada39a3e1e':
  docs: Plugin reference update
 2015-01-16 18:03:28 +00:00
Rich Slogar
d15015d206 am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit 'f38122dae0a344bc8abe3eaed7322ea3675b05f5':
  docs: studio sample procedure update
 2015-01-16 18:03:23 +00:00
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev 
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
 2015-01-16 09:54:30 -08:00
Ricardo Cervera
97c4ba9862 docs: Added info on noHistory and onActivityResult(). 
Bug: 13807256

Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83

Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
 2015-01-16 09:24:30 -08:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:21:32 +00:00
Ricardo Cervera
98f07d9014 am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:14:44 +00:00
Rich Slogar
3212c3aa22 Merge "docs: studio support library revisions update" into lmp-docs 2015-01-16 00:43:57 +00:00
Dirk Dougherty
d1ff86058a Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 2015-01-16 00:41:56 +00:00
Dirk Dougherty
27ab5a079b Doc change: Add new analytics information to Distribute. 
Change-Id: I0ce5c457469cc2628dad8a1b7254fc9068babc84
 2015-01-15 16:28:13 -08:00
Rich Slogar
3b7dbd66d8 Merge "docs: build link update" into lmp-docs 2015-01-16 00:27:50 +00:00
Rich Slogar
485b9566a9 Merge "docs: Plugin reference update" into lmp-docs 2015-01-16 00:27:05 +00:00
Rich Slogar
48fc1d7ba7 Merge "docs: studio sample procedure update" into lmp-docs 2015-01-16 00:26:39 +00:00
Rich Slogar
d7beb6d3eb docs: studio support library revisions update 
Change-Id: I9df9ffbcbb99e8b661ee5b67ac0efe28d6d19b4b
 2015-01-15 16:20:44 -08:00
Luan Nguyen
e184b2f235 am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'd5a114cd0e15bdd263bfd9704bdfeacd28dfe670':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:36:35 +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
Scott Rowe
c222198a2c docs: removing code captions 
Change-Id: Ifbeedf014741ff680640e1bdd0b35fa2d68f9e45
 2015-01-14 14:27:30 -08:00
Ricardo Cervera
8eb306077d am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a 
* commit '62ceea31564ac27c84ff78b400f844be98917c29':
  docs: Fix broken link in Common Intents
 2015-01-13 16:49:57 +00:00
Ricardo Cervera
f556941357 docs: Fix broken link in Common Intents 
Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
 2015-01-13 08:28:22 -08:00
Scott Rowe
8443fad483 docs: Add screenshot 
Change-Id: I0995d23e1df30ce17ce381c14a6cbd2de389c396
 2015-01-12 14:50:50 -08:00
Ricardo Cervera
9a19ed17e1 am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'eec6dd779ca170a80ff457828e2687da834d2c1f':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 22:16:09 +00:00
Ricardo Cervera
d8bd117ce0 Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 2015-01-12 21:49:23 +00:00
Joe Fernandez
d15b54d23f am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit '0bb84bb5e2a137475718e31fb25f06b160163588':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:39:24 +00:00
Joe Fernandez
520a3c8258 am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs 
* commit 'acd5f3ab40c81b5267b4b551e0fd55ce839351b9':
  docs: Remove Wear preview reference docs
 2015-01-12 21:31:02 +00:00
Joe Fernandez
8062f1f341 Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 2015-01-12 21:23:17 +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
Joe Fernandez
76110e7c46 docs: Remove Wear preview reference docs 
These docs are out of date and unreachable due to redirect rules.

Change-Id: I76d9ccfff139b2377c45d71af2998a99b82a2f14
 2015-01-12 10:28:03 -08:00
Joe Fernandez
05d9a5107f docs: Removing obsolete L-Preview docs and images 
- /preview/images/
- TV Preview index pages
- Notifications preview page

Change-Id: I3e7c4e06bcdb6804fd83a80a8171a9d8e0c57117
 2015-01-12 10:20:41 -08:00
Eric Gilmore
c6a228511c am 3fca2e7f: am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs 
* commit '3fca2e7fee3d657c74406f8405bc1d669b9392e8':
  Adding Android Fundamentals video.
 2015-01-12 17:19:05 +00:00
Eric Gilmore
fec824b611 Merge "Adding Android Fundamentals video." into lmp-docs 2015-01-12 17:02:32 +00:00
Eric Gilmore
c726557cbd 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 
* commit '2c7e563181405ae6a91edb57f654f884b8759c8e':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-12 16:55:40 +00:00
Rich Slogar
0c1228bb27 docs: link to sdk manager 
Change-Id: I41f656e2eee1189298292e3bcca387de05e0e3c7
 2015-01-09 16:33:32 -08:00
Eric Gilmore
6c8b80acbb Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 2015-01-09 22:42:47 +00:00
Eric Gilmore
46f751864b Adding Android Fundamentals video. 
Bug: 18820337
Change-Id: I758de61902f375d02219414999ea7833b5787474
 2015-01-09 13:22:59 -08:00
Joe Fernandez
97b7b8637b am d385640f: am 491a8257: docs: Update Dashboard for January 2015 
automerge: 0e13957

* commit '0e13957a4deab3a90492d9ae2f6d35d3b5c1773e':
  docs: Update Dashboard for January 2015
 2015-01-07 23:51:33 +00:00
Rich Slogar
3bb85fb8c9 docs: build link update 
Change-Id: I06a3e7fc914dff829bd1d210675daf5f99ba68e0
 2015-01-07 13:54:30 -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
bc8b0541d7 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 '96f11258ab19962c93b615c00b387bdc05c0d75b':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727
 2015-01-07 09:23:10 +00:00