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

7433 Commits

Author SHA1 Message Date
Joe Fernandez
5e90447fae Android TV Landing page, final (probably) 
Change-Id: I6a682f6962b4b01ae637301bcabd74fa67710ee4
 2014-06-24 20:54:15 -07:00
Joe Fernandez
52e2416cc7 Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs 2014-06-25 03:38:12 +00:00
Joe Fernandez
89722fc251 docs: fix wear whitelist sign up language to be less confusing 
Change-Id: I15fcad2db2df6f8f2717e486e306246de3f96f4b
 2014-06-25 15:40:48 -07:00
Robert Ly
6e35f209d6 Merge "docs:wear landing and training fixes" into klp-modular-dev 2014-06-25 03:38:12 +00:00
Robert Ly
7aae4d4f58 docs:wear landing and training fixes 
Change-Id: Iddf2392ec4ae79850099d3127ea274a71f32d0c4
 2014-06-25 00:15:03 -07:00
Robert Ly
2a139d6486 Merge "docs: add gms core preview hoop-jumping" into klp-docs 2014-06-25 03:38:12 +00:00
smain@google.com
80c07fb99b am ec6f162f: DO NOT MERGE! 
* commit 'ec6f162f0e3fc0d68c1ec0ac30ff1353bf4f1e97':
  DO NOT MERGE!
 2014-06-25 02:06:47 +00:00
smain@google.com
5f4a2b8385 am 53126416: DO NOT MERGE! 
* commit '531264164a2cd24fa412b71782ef424a2d968028':
  DO NOT MERGE!
 2014-06-25 02:06:43 +00:00
smain@google.com
ec6f162f0e DO NOT MERGE! 
add image to GP education collection card

Change-Id: Ie21813f84277ee8f882efc1a8589080476a4bf66
(cherry picked from commit f4787f4dce96bef3de95d36ce400691c72df3d7e)
 2014-06-25 02:03:36 +00:00
smain@google.com
531264164a DO NOT MERGE! 
update Edu pages for launch of Chrome edu apps on play store
removes the FAQ and Guidelines docs, redirect to devsite copy will
be implemented with separate CL

Change-Id: I006d2374b1d49fbf41ce60a39f08fe1ad96096c1
(cherry picked from commit 941f800a848a5dad4d4541a214477e95f738a5c8)
 2014-06-25 02:02:30 +00:00
Robert Ly
eab89e9505 docs: add gms core preview hoop-jumping 
Change-Id: Ic9602c0f3a309bd37dc5f628f4316b0124f0c8b3
 2014-06-24 18:54:49 -07:00
Robert Ly
59021e2a82 am d174461c: Merge "docs: Added descriptions of the l-preview samples." into klp-modular-dev 
* commit 'd174461c385ca7443631b330e7fc7ad2c66c8892':
  docs: Added descriptions of the l-preview samples.
 2014-06-25 01:33:52 +00:00
Ricardo Cervera
15f7ddfbb5 am 8b938c54: docs: Removing mercedes logo from auto site 
* commit '8b938c5418f4f15f0f70553a31b95078c255caec':
  docs: Removing mercedes logo from auto site
 2014-06-25 01:13:31 +00:00
Scott Main
48371ca146 am 4aa9c6d5: DO NOT MERGE Revert "Revert "add \'coming soon\' page for google io announcements"" 
* commit '4aa9c6d5d38a1091bda7950baba5a9199898a728':
  DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""
 2014-06-25 01:02:00 +00:00
Scott Main
1b4a9dbf83 am 87670bcb: Revert "add \'coming soon\' page for google io announcements" 
* commit '87670bcb34c308731bbec177dae99cd9981656fb':
  Revert "add 'coming soon' page for google io announcements"
 2014-06-25 01:01:57 +00:00
smain@google.com
bf5d1a93aa am cca2a91a: add \'coming soon\' page for google io announcements 
* commit 'cca2a91a7cba2f0005b9d4a9a21a506ed191c348':
  add 'coming soon' page for google io announcements
 2014-06-25 01:01:54 +00:00
Scott Main
4aa9c6d5d3 DO NOT MERGE 
Revert "Revert "add 'coming soon' page for google io announcements""

This reverts commit 87670bcb34c308731bbec177dae99cd9981656fb.

Change-Id: Ica55fdc9f345c55ab038ecbf836673be4f4bb1a0
 2014-06-25 00:58:45 +00:00
Scott Main
87670bcb34 Revert "add 'coming soon' page for google io announcements" 
This reverts commit cca2a91a7cba2f0005b9d4a9a21a506ed191c348.

Change-Id: I0212a0f0dbe63c14d796c9e764c0871790fddc46
 2014-06-25 00:57:48 +00:00
smain@google.com
cca2a91a7c add 'coming soon' page for google io announcements 
Change-Id: I17e09aaa3c93060b306301ffa5012d8fcee3af22
 2014-06-24 17:54:28 -07:00
Ricardo Cervera
8b938c5418 docs: Removing mercedes logo from auto site 
Change-Id: I155a76982858e038bdccaab7a6e0f368da82d362
 2014-06-24 17:53:53 -07:00
Joe Fernandez
b44aa788af am e748fb58: Merge "Android TV Design Guidelines" into klp-modular-dev 
* commit 'e748fb5891bac5bb6ae01a0d2550ab70a7ad9a81':
  Android TV Design Guidelines
 2014-06-25 00:38:58 +00:00
Quddus Chong
2b22c30422 am f9a4666b: Merge "docs: Updated L Preview Highlights (hopefully final)." into klp-modular-dev 
* commit 'f9a4666ba8f8d67ee9389502bfd8cb636f80f986':
  docs: Updated L Preview Highlights (hopefully final).
 2014-06-25 00:38:54 +00:00
Ricardo Cervera
670f7c724f am b00ec477: Merge "docs: Last minute eng feedback piece on L preview docs" into klp-modular-dev 
* commit 'b00ec477d95c5aa6883a4b0b23310ff988eb977c':
  docs: Last minute eng feedback piece on L preview docs
 2014-06-25 00:38:47 +00:00
Robert Ly
f843f79775 am 2d50cda2: Merge "docs: Noted that ADT require Java 7 for L dev preview." into klp-modular-dev 
* commit '2d50cda23876ffdf5cf4f83ead9b25ba81c55d1b':
  docs: Noted that ADT require Java 7 for L dev preview.
 2014-06-25 00:13:52 +00:00
Robert Ly
11291ee308 am 65d8b6b7: Merge "docs: Adding Create a Project instructions for L preview." into klp-modular-dev 
* commit '65d8b6b7ea581a507c32c872bda4717dc43c20ae':
  docs: Adding Create a Project instructions for L preview.
 2014-06-25 00:09:57 +00:00
Ricardo Cervera
6a94082f8d am 7561313e: docs: Replaced one of the gifs for the auto site 
* commit '7561313eb67372db1c809f092de238b10249f316':
  docs: Replaced one of the gifs for the auto site
 2014-06-25 00:09:53 +00:00
Ricardo Cervera
7561313eb6 docs: Replaced one of the gifs for the auto site 
Change-Id: I7e76167f7924084bc3434d8bcb830688a4e49428
 2014-06-24 16:30:04 -07:00
Joe Fernandez
9d644b668c am 6fd69be6: Merge "docs: Android TV Dev Guide, final (probably)" into klp-modular-dev 
* commit '6fd69be64cc34e4c3f223420dc404dadc244f28e':
  docs: Android TV Dev Guide, final (probably)
 2014-06-24 22:59:00 +00:00
Quddus Chong
641037ed83 docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0) 
Change-Id: If6c1738e8cac574ced4a1d2643c62771f317d678
 2014-06-24 15:26:17 -07:00
Andrew Solovay
296b5a77c7 am 5918a9c8: am 1d5976c8: am 906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs 
* commit '5918a9c8faf14bfbb9126aed56caefb3adc153ec':
  docs: Fixed instructions on checking VM version.
 2014-06-24 21:48:01 +00:00
Robert Ly
1ad113a1c8 am 5f036fb8: Merge "docs: ad dnew hero, remove arm" into klp-modular-dev 
* commit '5f036fb80bac5da7578cefaecdb62457e0067368':
  docs: ad dnew hero, remove arm
 2014-06-24 21:47:57 +00:00
Andrew Solovay
5918a9c8fa am 1d5976c8: am 906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs 
* commit '1d5976c844dfc8c54a633a1d3748f4dea528063c':
  docs: Fixed instructions on checking VM version.
 2014-06-24 21:44:43 +00:00
Ricardo Cervera
b30ad7455e am 5f5610ca: Merge "docs: Material L Preview engineering review fixes" into klp-modular-dev 
* commit '5f5610caf5a0154630cb900c3c28ae8acf591ce3':
  docs: Material L Preview engineering review fixes
 2014-06-24 21:42:55 +00:00
Ricardo Cervera
a78fcd688e am 4af882fd: Merge "docs: Adding docs for the new Android Studio wizards" into klp-modular-dev 
* commit '4af882fdf5ca60a9038cd66265ec2723c15a26c5':
  docs: Adding docs for the new Android Studio wizards
 2014-06-24 21:42:52 +00:00
Ricardo Cervera
af11452d76 am 23a0e2ac: Merge "docs: Replaced gifs" into klp-modular-dev 
* commit '23a0e2ac1b671059ab934ccf357f0bfdb4f2e492':
  docs: Replaced gifs
 2014-06-24 21:42:41 +00:00
Andrew Solovay
1d5976c844 am 906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs 
* commit '906eda45b27668e4c0a37b5ba3fbd530308883e6':
  docs: Fixed instructions on checking VM version.
 2014-06-24 21:39:27 +00:00
Robert Ly
1bac56dd42 am 9d9b71f8: Merge "docs: fix plus link" into klp-modular-dev 
* commit '9d9b71f84ed4c83eb55c6c744df937fae879e687':
  docs: fix plus link
 2014-06-24 21:14:47 +00:00
smain@google.com
0c18ecac66 am f4787f4d: add image to GP education collection card 
* commit 'f4787f4dce96bef3de95d36ce400691c72df3d7e':
  add image to GP education collection card
 2014-06-24 21:14:43 +00:00
smain@google.com
bcb29dbd10 am 8dd4d096: change start button to red for consistent "primary" action pattern 
* commit '8dd4d096a3c509816887b058fc34879878577e75':
  change start button to red for consistent "primary" action pattern
 2014-06-24 21:14:39 +00:00
smain@google.com
2d14e7e8a8 am 80e1a0cf: add Design guide for Wear. adds new Devices section to sidenav. 
* commit '80e1a0cff2c405b7ff90072e6a5aad649f22aba5':
  add Design guide for Wear. adds new Devices section to sidenav.
 2014-06-24 21:14:34 +00:00
Ricardo Cervera
549ac9036e am 3c3daf68: docs: Removed template references and addressed feedback. Added missing logos. 
* commit '3c3daf684458d868ec30c3b30dc91328274f207f':
  docs: Removed template references and addressed feedback. Added missing logos.
 2014-06-24 21:14:28 +00:00
Robert Ly
a1bb160897 am c6cb1cc2: docs: soften up langauge about safety and remove ui templates language 
* commit 'c6cb1cc2b52d79e165839fb329d6ff242a0239f4':
  docs: soften up langauge about safety and remove ui templates language
 2014-06-24 21:14:23 +00:00
Robert Ly
7320eeac12 am 93c5d262: Merge "docs: fix auto footer" into klp-modular-dev 
* commit '93c5d262f99dbf271de79e7093c65c9f272f6136':
  docs: fix auto footer
 2014-06-24 21:14:15 +00:00
Robert Ly
a0d06584f7 am 3db26d9d: docs: add correct arm image 
* commit '3db26d9d08bfed43b356c7462dbd0439ddd59c29':
  docs: add correct arm image
 2014-06-24 21:14:11 +00:00
Robert Ly
c7dc9d5d20 am 17f1b0a6: Merge "docs: fix blog post link, add arm image, fix ecosystem text" into klp-modular-dev 
* commit '17f1b0a6705be74a373fe31bd999d2696a5b7cf6':
  docs: fix blog post link, add arm image, fix ecosystem text
 2014-06-24 21:13:55 +00:00
Robert Ly
d1c8a3eb72 am 7395c0db: Merge "docs: Updates to the L Preview Highlights." into klp-modular-dev 
* commit '7395c0dbf37c536c37521bfabde90c1a6e9b7e9b':
  docs: Updates to the L Preview Highlights.
 2014-06-24 21:13:51 +00:00
Robert Ly
a5314536f6 am 0ebf5c7f: Merge "docs: Updates for L Preview Support page." into klp-modular-dev 
* commit '0ebf5c7f4dee231bd71fb98ee6ab4e0cb943685f':
  docs: Updates for L Preview Support page.
 2014-06-24 21:13:47 +00:00
Ricardo Cervera
9fa541bd4e am 7e81aab5: docs: Removed para based on copy review from Auto landing page. 
* commit '7e81aab55ae941800b90cb2a5af3da488ddebbe7':
  docs: Removed para based on copy review from Auto landing page.
 2014-06-24 21:13:43 +00:00
Ricardo Cervera
6c370114c2 am 5b225bf4: Merge "docs: Added three columns on the Auto SDK." into klp-modular-dev 
* commit '5b225bf474cbec860988348d2698ad5b632348ca':
  docs: Added three columns on the Auto SDK.
 2014-06-24 21:13:39 +00:00
Quddus Chong
ab93c42cd5 am a93744bd: Merge "docs: Updated L Preview Support page." into klp-modular-dev 
* commit 'a93744bde3103613a834ffee3626fb72e223a17d':
  docs: Updated L Preview Support page.
 2014-06-24 21:13:31 +00:00