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

6649 Commits

Author SHA1 Message Date
smain@google.com
d9d9d335fb am 80c07fb9: am ec6f162f: DO NOT MERGE! 
* commit '80c07fb99b5a923ffd35e1b8e4cff64197074aa5':
  DO NOT MERGE!
 2014-06-25 19:21:08 +00: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
Ricardo Cervera
0ac4b32d58 docs: Updated Renault logo on the Auto site 
Lined up the icons to fit all rows.

Change-Id: I1495629dff2851cb376fa5d4295a0b9a5e4d608c
 2014-06-24 23:58:43 -07:00
Joe Fernandez
1262f85d24 Merge "Android TV Landing page, final (probably)" into klp-modular-dev 2014-06-25 03:44:18 +00:00
Robert Ly
18ec418657 fix samples page 
Change-Id: I47e7976e33ddb6d3fbd010c546092a0cb858ea60
 2014-06-24 21:17:45 -07:00
Joe Fernandez
5e90447fae Android TV Landing page, final (probably) 
Change-Id: I6a682f6962b4b01ae637301bcabd74fa67710ee4
 2014-06-24 20:54:15 -07: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
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
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
e1beb730c3 Merge "docs: wear training classes" into klp-modular-dev 2014-06-24 08:05:46 +00:00
Robert Ly
2728c2a93a docs: wear training classes 
Change-Id: I542b3bc87d3a24bf89ea9b7d8edeec224780f31b
 2014-06-24 16:49:48 -07:00
Robert Ly
5f036fb80b Merge "docs: ad dnew hero, remove arm" into klp-modular-dev 2014-06-24 18:00:13 +00:00
Robert Ly
b52a91ea32 docs: ad dnew hero, remove arm 
Change-Id: I2e647742567452e4789049a74741eb03e232cc47
 2014-06-24 14:35:22 -07:00
Ricardo Cervera
5f5610caf5 Merge "docs: Material L Preview engineering review fixes" into klp-modular-dev 2014-06-24 17:32:43 +00:00
Ricardo Cervera
6dacb26b07 docs: Material L Preview engineering review fixes 
Change-Id: I3fc95b65515ae75d6c74a62f9614f994cfb83df3
 2014-06-24 13:53:21 -07:00
Ricardo Cervera
4af882fdf5 Merge "docs: Adding docs for the new Android Studio wizards" into klp-modular-dev 2014-06-24 18:00:13 +00:00
Ricardo Cervera
1f0ffac153 docs: Adding docs for the new Android Studio wizards 
Change-Id: I19cf428b21d79f45fad325fa36fc51f043733994
 2014-06-24 14:27:35 -07:00
Robert Ly
9d9b71f84e Merge "docs: fix plus link" into klp-modular-dev 2014-06-24 17:32:43 +00:00
Robert Ly
4ae83c1e1c docs: fix plus link 
Change-Id: I48d54e107c648d0a00cd2edc2b8bfe7c13013847
 2014-06-24 12:38:41 -07:00
smain@google.com
f4787f4dce add image to GP education collection card 
Change-Id: Ie21813f84277ee8f882efc1a8589080476a4bf66
 2014-06-24 12:35:31 -07:00
smain@google.com
8dd4d096a3 change start button to red for consistent "primary" action pattern 
Change-Id: I6d6b27322f6ed59731315371f09783174dea9c7b
 2014-06-24 12:07:50 -07:00
smain@google.com
80e1a0cff2 add Design guide for Wear. adds new Devices section to sidenav. 
Change-Id: I5836ec4862fa731fae801c0fe8ba64bb056b69ab
 2014-06-24 12:02:19 -07:00
Ricardo Cervera
3c3daf6844 docs: Removed template references and addressed feedback. Added missing logos. 
Change-Id: I29499df7801d8cea61d7a6ce7a877353fb879b13
 2014-06-24 10:22:30 -07:00
Robert Ly
c6cb1cc2b5 docs: soften up langauge about safety and remove ui templates language 
Change-Id: Id8499a02bb7ccae5dd8eeb6b13a2d2815d0a8b46
 2014-06-24 09:12:38 -07:00
Robert Ly
8c51ee8409 Merge "docs: add gms core hoop jumping" into klp-modular-dev 2014-06-24 07:59:24 +00:00
Robert Ly
2b1af4ad72 docs: add gms core hoop jumping 
Change-Id: I7f1cdfefa3526915cbc85c34cfd061803ec048c4
 2014-06-24 18:47:32 -07:00
Robert Ly
93c5d262f9 Merge "docs: fix auto footer" into klp-modular-dev 2014-06-24 00:22:15 +00:00
Robert Ly
3db26d9d08 docs: add correct arm image 
Change-Id: Icea04e2c07ed1f5b757abe5a92bec74304238e3e
 2014-06-23 23:51:39 -07:00
Robert Ly
6bcec232df docs: fix auto footer 
Change-Id: I84db14897bbcece07d5597b7e09bb5c23fb47ba1
 2014-06-23 22:21:20 -07:00
Joe Fernandez
4c4f8b32a0 Merge "docs: Fixes for Android TV Dev Guide" into klp-modular-dev 2014-06-23 21:50:10 +00:00
Joe Fernandez
3e5dd3d927 docs: Fixes for Android TV Dev Guide 
Change-Id: I9abe240a64fc4e9fcfcc46b378bf0bd0c316cc9e
 2014-06-24 18:32:54 -07:00
Ricardo Cervera
8b938c5418 docs: Removing mercedes logo from auto site 
Change-Id: I155a76982858e038bdccaab7a6e0f368da82d362
 2014-06-24 17:53:53 -07:00
Robert Ly
d174461c38 Merge "docs: Added descriptions of the l-preview samples." into klp-modular-dev 2014-06-24 07:59:36 +00:00
Andrew Solovay
fb7a287136 docs: Added descriptions of the l-preview samples. 
As per Robert's suggestion, added a few representative screenshots.
Copied the overview material from the KitKat samples section.

Doc is staged to:

http://asolovay.mtv:9199/preview/samples.html

Change-Id: I26a1ebeb4310db63c4653dff1cb8650e52af19a2
 2014-06-24 16:10:20 -07:00
Joe Fernandez
e748fb5891 Merge "Android TV Design Guidelines" into klp-modular-dev 2014-06-24 07:59:36 +00:00
Joe Fernandez
291bf719b1 Android TV Design Guidelines 
Change-Id: I7329565ef62a5d3590ca668bba5d90e10dab6078
 2014-06-24 16:45:34 -07: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
Quddus Chong
f9a4666ba8 Merge "docs: Updated L Preview Highlights (hopefully final)." into klp-modular-dev 2014-06-24 17:32:43 +00:00
Quddus Chong
26aec76b58 docs: Updated L Preview Highlights (hopefully final). 
Change-Id: Ife51fb950b0e3c7f21e69024c435ca62e6906d5b
 2014-06-24 14:12:05 -07:00
Ricardo Cervera
b00ec477d9 Merge "docs: Last minute eng feedback piece on L preview docs" into klp-modular-dev 2014-06-24 17:32:43 +00:00
Ricardo Cervera
d5061ba1c3 docs: Last minute eng feedback piece on L preview docs 
Change-Id: Ia6d0e500bd889d006936791e24eaab5843ea8f38
 2014-06-24 17:10:13 -07:00