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

605 Commits

Author SHA1 Message Date
Rich Slogar
3e1cfe106a am fea8ddd4: am a9315dc1: am c1002dfc: am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs 
* commit 'fea8ddd4c7a79cc68a96901f86cfa527bbd44fd0':
  docs: studio remove gradle tasks dialog
 2015-04-17 18:01:05 +00:00
Rich Slogar
56a38d46ac am 58befba6: am 124c4025: am 1252b4b8: am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs 
* commit '58befba6ac88b4216cac43f97a456d1119dcb972':
  docs: hierarchyviewer updates
 2015-04-17 18:00:53 +00:00
Rich Slogar
1fcc6bd854 Merge "docs: studio remove gradle tasks dialog" into lmp-docs 2015-04-17 16:53:34 +00:00
Rich Slogar
efe861a4a7 Merge "docs: hierarchyviewer updates" into lmp-docs 2015-04-17 16:52:45 +00:00
Rich Slogar
f9f81b49d0 docs: hierarchyviewer updates 
b/19955159

Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
 2015-04-15 15:48:35 -07:00
Rich Slogar
caa15d49f9 docs: studio remove gradle tasks dialog 
Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
 2015-04-15 10:30:18 -07:00
Dirk Dougherty
8cc578c37b am 38544901: am f2a57c69: am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit '38544901e6aa6934b032303be314a92dcde662f3':
  Doc change: add new pages for Designed for Families.
 2015-04-14 05:13:35 +00:00
Dirk Dougherty
f802cc02a2 Doc change: add new pages for Designed for Families. 
Change-Id: I9bda34abf7b045213c0fcb7f044ee86155900808
 2015-04-13 20:23:18 -07:00
Scott Rowe
991d45b4fd am bb18c2d4: am 0f2f0350: am 5f78af44: am a03245a3: am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit 'bb18c2d4ab7ed592810eb9031a892fb4748ecadc':
  docs: Building Live TV Apps
 2015-04-02 01:39:39 +00:00
Scott Rowe
ab8c34ffc4 docs: Building Live TV Apps 
Change-Id: I8d0015e6c8a8a24c661434ca5cf88defd27ae8cf
 2015-04-01 12:06:08 -07:00
Joe Fernandez
a33a272794 am ecef2964: am 51b34999: am 8e211e86: am cd9cd187: am e31c9048: am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 
* commit 'ecef296420d9374626134bb32f63b50757e00e71':
  docs: Add distribution guidelines and update quality checklist for Android Auto.
 2015-03-19 03:16:50 +00:00
Joe Fernandez
cb92819fac Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 2015-03-18 23:41:29 +00:00
Luan Nguyen
8662c04fd7 docs: Add distribution guidelines and update quality checklist 
for Android Auto.

Change-Id: Ie504fee6ee32fd24d332ff65004a6b711e7fe3ec
 2015-03-16 13:54:51 -07:00
Rich Slogar
f9d525912c am 93d44992: am 1a27a3fb: am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs 
* commit '93d44992ecf41b8169391005f7d3d219785eef90':
  docs: build image updates
 2015-03-13 06:33:26 +00:00
Rich Slogar
a6b0ddb7f1 Merge "docs: build image updates" into lmp-docs 2015-03-12 00:34:10 +00:00
Eric Gilmore
2977c05fec am 89d0c0fb: am bcea1fcd: am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit '89d0c0fbaec976b8b06c81a2950aed3a3c5e5b1b':
  Reworking geofencing training to new API and sample.
 2015-03-10 15:47:43 +00:00
Eric Gilmore
0bceaacf42 Merge "Reworking geofencing training to new API and sample." into lmp-docs 2015-03-06 19:14:28 +00:00
Eric Gilmore
a0e3eb7ba2 Reworking geofencing training to new API and sample. 
Change-Id: Ibc9e2561cd93e73eab87a78f4aabe64ae9c8a0b3
 2015-03-06 10:50:59 -08:00
Rich Slogar
2868e7260a docs: build image updates 
Change-Id: I9bc252b2f3a43085b69b1177242cc8b1fc0e0662
 2015-02-25 15:39:07 -08:00
Joe Fernandez
3f6809452d am 20928cae: am 4e3e6fb1: am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs 
* commit '20928caef4c4f90793408afc91e6d48f0551b4a5':
  docs: Android for Work developer landing page
 2015-02-25 17:26:33 +00:00
Joe Fernandez
108ccac1a1 docs: Android for Work developer landing page 
Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a
 2015-02-24 17:32:30 -08:00
Rich Slogar
64d090d85a am 93cd3929: am c905da57: am 5af2270b: am cd9c0cab: am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates 
* commit '93cd3929ae757e499c13a03f575c4bd0721ac4b6':
  docs: lint inspection updates
 2015-02-18 23:50:14 +00:00
Rich Slogar
56375d9066 docs: lint inspection updates 
Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f
 2015-02-18 14:17:21 -08:00
Rich Sloager
263b8fb778 am 85b066cb: am 821bb7fd: am 3a69c24f: am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc 
* commit '85b066cb8a760ad1a20f7f758c3b7947aea96231':
  Revert "docs: studio proxy setup"
 2015-02-18 11:13:23 +00:00
Chris Banes
6026f73406 resolved conflicts for merge of 1c131eeb to master 
Change-Id: I886d726322514fa3b27cdc80b8dd57faa94bade5
 2015-02-18 11:02:49 +00:00
Rich Slogar
7a217113d8 am 65d12bf7: am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00 
* commit '65d12bf7f14ff7568cc3011793e219391f9c3d29':
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-18 00:30:08 +00:00
Oliver Woodman
dc24d421cf am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d automerge: 1289d52 
automerge: 6a71e81

* commit '6a71e814a3207fbe2cffe0650a1c37688f2aa62e':
  Update ExoPlayer developer guide.
 2015-02-17 23:57:47 +00:00
Rich Sloager
099ce51393 Merge "Revert "docs: studio proxy setup"" into lmp-docs 2015-02-17 22:13:45 +00:00
Rich Sloager
383dacc738 Revert "docs: studio proxy setup" 
This reverts commit c3e0107ce30aa676011bf7ea0daa9c8db750f024.

Change-Id: I7edf925fe51a79284a3e7a94d60174308fa56d4b
 2015-02-17 22:10:27 +00:00
Rich Slogar
3c3b780cae Merge "docs: studio mipmap update" into lmp-docs 2015-02-17 22:06:46 +00:00
Rich Slogar
8823b93d5c Merge changes If3a78fc7,Ifbe3f03a into lmp-docs 
* changes:
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-17 22:02:45 +00:00
Oliver Woodman
a2e9e27f4c Update ExoPlayer developer guide. 
This is a minimal update, just to fix things that are broken
or no longer make sense as of the v1.2.0 release.

Change-Id: If519709c91c975d96b62e2dd28e18e2105735c2b
 2015-02-17 20:47:17 +00:00
Rich Slogar
38f2242e39 docs: studio mipmap update 
Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d
 2015-02-13 17:17:41 -08:00
Luan Nguyen
5ed11d837f am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs automerge: 6ee9018 
automerge: c6ec799

* commit 'c6ec79913fbcf5b915ed55f3cc7b49690ee997f9':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 20:10:56 +00:00
Luan Nguyen
e49fbfa21c Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 2015-02-10 18:31:30 +00:00
Luan Nguyen
c25adda636 docs: Fix various issues with incorrect code samples. 
bug: 15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
 2015-02-10 09:39:44 -08:00
Yin-Chia Yeh
956c52b5a0 Camera2: doc update for HAL3.3 tonemapping change 
Codegen doc change.

Change-Id: Idd5185767c177f3179e5833be3f42357a5ead25f
 2015-02-06 12:53:31 -08:00
Scott Rowe
da0c5de5fa docs: Card View for Android TV training 
Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96
 2015-01-29 10:50:25 -08:00
Ricardo Cervera
de113066d8 docs: Transitions training class. 
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
 2015-01-27 11:35:20 -08:00
Rich Slogar
c3e0107ce3 docs: studio proxy setup 
Change-Id: Ifbe3f03a47cfb1a59ade4e2fb678a51a7256fdb4
 2015-01-26 11:59:30 -08:00
Scott Rowe
ab18d6c82e Merge "docs: Add screenshot" into lmp-docs 2015-01-17 01:31:15 +00:00
Rich Slogar
8f93abeb60 docs: adding studio-sample-in-editor.png file 
Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505
 2015-01-16 12:26:20 -08:00
Scott Rowe
8443fad483 docs: Add screenshot 
Change-Id: I0995d23e1df30ce17ce381c14a6cbd2de389c396
 2015-01-12 14:50:50 -08:00
Scott Rowe
ea7a71b25d docs: b/18122848 [DAC] Android TV - Recommendation card 
Change-Id: I3347254ae659e4edc7a07aa30b276bd24636db17
 2014-12-19 16:11:58 -08:00
Joe Fernandez
1e82428495 Merge "docs: Add Distributing to Android Wear doc" into lmp-docs 2014-12-10 02:10:07 +00:00
Luan Nguyen
cbd0032df2 docs: Add Distributing to Android Wear doc 
Change-Id: I123f53b4d7a1098c1caabc88a1e6fd6dd828d3fb
 2014-12-09 15:30:24 -08:00
Rich Slogar
01ab09c2a9 docs:studio basics images updates 
Change-Id: Ib16bbd76f2afe884a55aba3e23540047523e33f2
 2014-12-08 13:53:03 -08:00
smain@google.com
d3c9f2b970 update studio hero image and add section about code editor [CP] 
Cherry-pick from Change-Id: Ifd9c5b22139b3ded42c3dab31e9946c40c4f0b38

Change-Id: I9ad74421e2501437de7f36e62e28d1aaede75847
 2014-12-07 21:00:30 -08:00
Rich Slogar
4083327e0e docs:build system updates [CP] 
Cherry-pick from Change-Id: I8a5810824cbef3bb81173d80827075d3754d7573

Change-Id: I1e948a18a5e7cc58ae712c50887e69ab8600e536
 2014-12-07 20:51:00 -08:00
smain@google.com
29e13c5ae7 new Android Studio download page [CP] 
Cherry-picked from Change-Id: I42ad17c9287dc376d856dfb549e47a912fc35417

Change-Id: I8a964c7e979c48f2cd7e626a983cd7ee5c7e9bfd
 2014-12-07 20:17:21 -08:00