OSDN Git Service
destradaa [Wed, 25 Jun 2014 22:55:07 +0000 (22:55 +0000)]
Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev
smain@google.com [Wed, 25 Jun 2014 22:11:40 +0000 (15:11 -0700)]
fix back link for preview nav
Change-Id: I684129ba5c43d49ff52410939e8b034ccc4877ad
Robert Ly [Wed, 25 Jun 2014 19:29:45 +0000 (19:29 +0000)]
am
d0039968: (-s ours) am
2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs
* commit '
d0039968fa6caafcbb39e9613af75686a2f1ce46':
docs: add gms core preview hoop-jumping
smain@google.com [Wed, 25 Jun 2014 19:21:08 +0000 (19:21 +0000)]
smain@google.com [Wed, 25 Jun 2014 19:21:04 +0000 (19:21 +0000)]
am
5f4a2b83: (-s ours) am
53126416: DO NOT MERGE!
* commit '
5f4a2b83850868fa5898661cb2555e54023060c0':
DO NOT MERGE!
DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""
Scott Main [Wed, 25 Jun 2014 19:12:48 +0000 (19:12 +0000)]
am
1b4a9dbf: (-s ours) am
87670bcb: Revert "add \'coming soon\' page for google io announcements"
* commit '
1b4a9dbf832870fc0ffc17212d10b34e61d4c943':
Revert "add 'coming soon' page for google io announcements"
smain@google.com [Wed, 25 Jun 2014 19:06:23 +0000 (19:06 +0000)]
am
bf5d1a93: (-s ours) am
cca2a91a: add \'coming soon\' page for google io announcements
* commit '
bf5d1a93aa585124c110c950a2584212a7d19a6f':
add 'coming soon' page for google io announcements
Robert Ly [Wed, 25 Jun 2014 21:34:58 +0000 (21:34 +0000)]
Merge "docs: add gcore instructions for preview" into klp-modular-dev
Robert Ly [Wed, 25 Jun 2014 17:56:07 +0000 (10:56 -0700)]
docs: add gcore instructions for preview
Change-Id: I51913920a00cb197682393f04ba3e7a96074202f
smain@google.com [Wed, 25 Jun 2014 21:21:30 +0000 (21:21 +0000)]
Merge "add license wall to downloading the L Preview system images" into klp-modular-dev
smain@google.com [Wed, 25 Jun 2014 21:02:26 +0000 (14:02 -0700)]
add license wall to downloading the L Preview system images
Change-Id: I8c7d84bb44e05382ee73355b6f41ca2c82bf57d4
Joe Fernandez [Wed, 25 Jun 2014 20:47:04 +0000 (20:47 +0000)]
Merge "Final L-Preview Guidelines for Android TV Games Staged at boku.mtv.corp.google.com:9195/preview/tv/games/index.html" into klp-modular-dev
David Friedman [Wed, 25 Jun 2014 01:37:09 +0000 (18:37 -0700)]
Final L-Preview Guidelines for Android TV Games
Staged at http://boku.mtv.corp.google.com:9195/preview/tv/games/index.html
Change-Id: I87a5394a74ca62ed84ad7ad7596a1d75b77c39f2
Robert Ly [Wed, 25 Jun 2014 04:01:53 +0000 (04:01 +0000)]
am
2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs
* commit '
2a139d648602e6812e5366ec1abc29fa2b010c99':
docs: add gms core preview hoop-jumping
Robert Ly [Wed, 25 Jun 2014 18:57:23 +0000 (18:57 +0000)]
Merge "fix build" into klp-modular-dev
Robert Ly [Wed, 25 Jun 2014 18:55:00 +0000 (11:55 -0700)]
fix build
Change-Id: I1f5ab49236b85cd1bd46e8199e7fd6decad73064
Baligh Uddin [Wed, 25 Jun 2014 16:31:40 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 25 Jun 2014 16:22:24 +0000 (09:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I82eb9106f42f46973f288f800f40e654d4aa0366
Auto-generated-cl: translation import
Baligh Uddin [Wed, 25 Jun 2014 16:19:40 +0000 (09:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie837118d09297e09f5e4f837480b6a87aa37dca5
Auto-generated-cl: translation import
Robert Ly [Wed, 25 Jun 2014 07:17:13 +0000 (07:17 +0000)]
Merge "docs:wear landing and training fixes" into klp-modular-dev
Robert Ly [Wed, 25 Jun 2014 06:00:41 +0000 (23:00 -0700)]
docs:wear landing and training fixes
Change-Id: Iddf2392ec4ae79850099d3127ea274a71f32d0c4
Ricardo Cervera [Wed, 25 Jun 2014 06:36:14 +0000 (23:36 -0700)]
docs: Updated Renault logo on the Auto site
Lined up the icons to fit all rows.
Change-Id: I1495629dff2851cb376fa5d4295a0b9a5e4d608c
Joe Fernandez [Wed, 25 Jun 2014 04:37:27 +0000 (04:37 +0000)]
Merge "Android TV Landing page, final (probably)" into klp-modular-dev
Robert Ly [Wed, 25 Jun 2014 04:17:45 +0000 (21:17 -0700)]
fix samples page
Change-Id: I47e7976e33ddb6d3fbd010c546092a0cb858ea60
Joe Fernandez [Wed, 18 Jun 2014 17:48:45 +0000 (10:48 -0700)]
Android TV Landing page, final (probably)
Change-Id: I6a682f6962b4b01ae637301bcabd74fa67710ee4
Robert Ly [Wed, 25 Jun 2014 03:57:34 +0000 (03:57 +0000)]
Merge "docs: add gms core preview hoop-jumping" into klp-docs
smain@google.com [Wed, 25 Jun 2014 02:06:47 +0000 (02:06 +0000)]
smain@google.com [Wed, 25 Jun 2014 02:06:43 +0000 (02:06 +0000)]
smain@google.com [Tue, 24 Jun 2014 19:35:31 +0000 (12:35 -0700)]
DO NOT MERGE!
add image to GP education collection card
Change-Id: Ie21813f84277ee8f882efc1a8589080476a4bf66
(cherry picked from commit
f4787f4dce96bef3de95d36ce400691c72df3d7e)
smain@google.com [Wed, 18 Jun 2014 23:13:56 +0000 (16:13 -0700)]
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)
Robert Ly [Wed, 25 Jun 2014 01:10:33 +0000 (18:10 -0700)]
docs: add gms core preview hoop-jumping
Change-Id: Ic9602c0f3a309bd37dc5f628f4316b0124f0c8b3
Scott Main [Wed, 25 Jun 2014 01:02:00 +0000 (01:02 +0000)]
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""
Scott Main [Wed, 25 Jun 2014 01:01:57 +0000 (01:01 +0000)]
am
87670bcb: Revert "add \'coming soon\' page for google io announcements"
* commit '
87670bcb34c308731bbec177dae99cd9981656fb':
Revert "add 'coming soon' page for google io announcements"
smain@google.com [Wed, 25 Jun 2014 01:01:54 +0000 (01:01 +0000)]
am
cca2a91a: add \'coming soon\' page for google io announcements
* commit '
cca2a91a7cba2f0005b9d4a9a21a506ed191c348':
add 'coming soon' page for google io announcements
Scott Main [Wed, 25 Jun 2014 00:58:45 +0000 (00:58 +0000)]
DO NOT MERGE
Revert "Revert "add 'coming soon' page for google io announcements""
This reverts commit
87670bcb34c308731bbec177dae99cd9981656fb.
Change-Id: Ica55fdc9f345c55ab038ecbf836673be4f4bb1a0
Scott Main [Wed, 25 Jun 2014 00:57:48 +0000 (00:57 +0000)]
Revert "add 'coming soon' page for google io announcements"
This reverts commit
cca2a91a7cba2f0005b9d4a9a21a506ed191c348.
Change-Id: I0212a0f0dbe63c14d796c9e764c0871790fddc46
smain@google.com [Wed, 25 Jun 2014 00:47:30 +0000 (17:47 -0700)]
add 'coming soon' page for google io announcements
Change-Id: I17e09aaa3c93060b306301ffa5012d8fcee3af22
Andrew Solovay [Tue, 24 Jun 2014 21:39:27 +0000 (21:39 +0000)]
am
906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs
* commit '
906eda45b27668e4c0a37b5ba3fbd530308883e6':
docs: Fixed instructions on checking VM version.
Robert Ly [Wed, 25 Jun 2014 01:56:40 +0000 (01:56 +0000)]
Merge "docs: wear training classes" into klp-modular-dev
Robert Ly [Mon, 16 Jun 2014 05:00:13 +0000 (22:00 -0700)]
docs: wear training classes
Change-Id: I542b3bc87d3a24bf89ea9b7d8edeec224780f31b
Robert Ly [Tue, 24 Jun 2014 21:42:32 +0000 (21:42 +0000)]
Merge "docs: ad dnew hero, remove arm" into klp-modular-dev
Robert Ly [Tue, 24 Jun 2014 21:33:05 +0000 (14:33 -0700)]
docs: ad dnew hero, remove arm
Change-Id: I2e647742567452e4789049a74741eb03e232cc47
Ricardo Cervera [Tue, 24 Jun 2014 21:39:40 +0000 (21:39 +0000)]
Merge "docs: Material L Preview engineering review fixes" into klp-modular-dev
Ricardo Cervera [Thu, 19 Jun 2014 21:40:37 +0000 (14:40 -0700)]
docs: Material L Preview engineering review fixes
Change-Id: I3fc95b65515ae75d6c74a62f9614f994cfb83df3
Ricardo Cervera [Tue, 24 Jun 2014 21:39:17 +0000 (21:39 +0000)]
Merge "docs: Adding docs for the new Android Studio wizards" into klp-modular-dev
Ricardo Cervera [Fri, 20 Jun 2014 00:40:06 +0000 (17:40 -0700)]
docs: Adding docs for the new Android Studio wizards
Change-Id: I19cf428b21d79f45fad325fa36fc51f043733994
Robert Ly [Tue, 24 Jun 2014 19:39:54 +0000 (19:39 +0000)]
Merge "docs: fix plus link" into klp-modular-dev
Robert Ly [Tue, 24 Jun 2014 19:38:41 +0000 (12:38 -0700)]
docs: fix plus link
Change-Id: I48d54e107c648d0a00cd2edc2b8bfe7c13013847
smain@google.com [Tue, 24 Jun 2014 19:35:31 +0000 (12:35 -0700)]
add image to GP education collection card
Change-Id: Ie21813f84277ee8f882efc1a8589080476a4bf66
smain@google.com [Tue, 24 Jun 2014 19:07:50 +0000 (12:07 -0700)]
change start button to red for consistent "primary" action pattern
Change-Id: I6d6b27322f6ed59731315371f09783174dea9c7b
smain@google.com [Mon, 23 Jun 2014 17:26:15 +0000 (10:26 -0700)]
add Design guide for Wear. adds new Devices section to sidenav.
Change-Id: I5836ec4862fa731fae801c0fe8ba64bb056b69ab
Ricardo Cervera [Tue, 24 Jun 2014 17:22:30 +0000 (10:22 -0700)]
docs: Removed template references and addressed feedback. Added missing logos.
Change-Id: I29499df7801d8cea61d7a6ce7a877353fb879b13
Robert Ly [Tue, 24 Jun 2014 15:59:47 +0000 (08:59 -0700)]
docs: soften up langauge about safety and remove ui templates language
Change-Id: Id8499a02bb7ccae5dd8eeb6b13a2d2815d0a8b46
Robert Ly [Wed, 25 Jun 2014 01:29:57 +0000 (01:29 +0000)]
Merge "docs: Added descriptions of the l-preview samples." into klp-modular-dev
Ricardo Cervera [Wed, 25 Jun 2014 00:53:53 +0000 (17:53 -0700)]
docs: Removing mercedes logo from auto site
Change-Id: I155a76982858e038bdccaab7a6e0f368da82d362
Andrew Solovay [Tue, 24 Jun 2014 22:35:09 +0000 (15:35 -0700)]
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
Joe Fernandez [Wed, 25 Jun 2014 00:31:06 +0000 (00:31 +0000)]
Merge "Android TV Design Guidelines" into klp-modular-dev
Joe Fernandez [Tue, 17 Jun 2014 05:44:20 +0000 (22:44 -0700)]
Android TV Design Guidelines
Change-Id: I7329565ef62a5d3590ca668bba5d90e10dab6078
Andrew Solovay [Tue, 24 Jun 2014 21:44:43 +0000 (21:44 +0000)]
am
1d5976c8: am
906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs
* commit '
1d5976c844dfc8c54a633a1d3748f4dea528063c':
docs: Fixed instructions on checking VM version.
Quddus Chong [Wed, 25 Jun 2014 00:27:20 +0000 (00:27 +0000)]
Merge "docs: Updated L Preview Highlights (hopefully final)." into klp-modular-dev
Quddus Chong [Tue, 24 Jun 2014 17:14:12 +0000 (10:14 -0700)]
docs: Updated L Preview Highlights (hopefully final).
Change-Id: Ife51fb950b0e3c7f21e69024c435ca62e6906d5b
Ricardo Cervera [Wed, 25 Jun 2014 00:25:52 +0000 (00:25 +0000)]
Merge "docs: Last minute eng feedback piece on L preview docs" into klp-modular-dev
Ricardo Cervera [Tue, 24 Jun 2014 23:48:27 +0000 (16:48 -0700)]
docs: Last minute eng feedback piece on L preview docs
Change-Id: Ia6d0e500bd889d006936791e24eaab5843ea8f38
Robert Ly [Wed, 25 Jun 2014 00:10:34 +0000 (00:10 +0000)]
Merge "docs: Noted that ADT require Java 7 for L dev preview." into klp-modular-dev
Andrew Solovay [Tue, 24 Jun 2014 23:02:32 +0000 (16:02 -0700)]
docs: Noted that ADT require Java 7 for L dev preview.
Doc is staged to:
http://asolovay.mtv:9099/preview/setup-sdk.html
Change-Id: Ida4a8fece37f7671796fb8eb5f2a06583cf4f9e4
Robert Ly [Wed, 25 Jun 2014 00:04:30 +0000 (00:04 +0000)]
Merge "docs: Adding Create a Project instructions for L preview." into klp-modular-dev
Ricardo Cervera [Tue, 24 Jun 2014 23:30:04 +0000 (16:30 -0700)]
docs: Replaced one of the gifs for the auto site
Change-Id: I7e76167f7924084bc3434d8bcb830688a4e49428
Ricardo Cervera [Tue, 24 Jun 2014 23:19:39 +0000 (16:19 -0700)]
docs: Adding Create a Project instructions for L preview.
Change-Id: Idd8536d9fefc16b3e3c8ecf31d9f7c6b72eb85ba
Robert Ly [Wed, 25 Jun 2014 01:51:51 +0000 (01:51 +0000)]
Merge "docs: add gms core hoop jumping" into klp-modular-dev
Robert Ly [Wed, 25 Jun 2014 01:12:51 +0000 (18:12 -0700)]
docs: add gms core hoop jumping
Change-Id: I7f1cdfefa3526915cbc85c34cfd061803ec048c4
Joe Fernandez [Tue, 24 Jun 2014 22:54:34 +0000 (22:54 +0000)]
Merge "docs: Android TV Dev Guide, final (probably)" into klp-modular-dev
Robert Ly [Mon, 16 Jun 2014 23:15:12 +0000 (16:15 -0700)]
docs: Android TV Dev Guide, final (probably)
Change-Id: I5b333daa32ff9a50724151631661fab126b68704
Robert Ly [Tue, 24 Jun 2014 16:02:03 +0000 (16:02 +0000)]
Merge "docs: fix auto footer" into klp-modular-dev
Robert Ly [Tue, 24 Jun 2014 06:51:39 +0000 (23:51 -0700)]
docs: add correct arm image
Change-Id: Icea04e2c07ed1f5b757abe5a92bec74304238e3e
Robert Ly [Tue, 24 Jun 2014 05:21:20 +0000 (22:21 -0700)]
docs: fix auto footer
Change-Id: I84db14897bbcece07d5597b7e09bb5c23fb47ba1
Joe Fernandez [Wed, 25 Jun 2014 01:35:15 +0000 (01:35 +0000)]
Merge "docs: Fixes for Android TV Dev Guide" into klp-modular-dev
Joe Fernandez [Wed, 25 Jun 2014 01:22:25 +0000 (18:22 -0700)]
docs: Fixes for Android TV Dev Guide
Change-Id: I9abe240a64fc4e9fcfcc46b378bf0bd0c316cc9e
Andrew Solovay [Tue, 24 Jun 2014 21:35:31 +0000 (21:35 +0000)]
Merge "docs: Fixed instructions on checking VM version." into klp-docs
Andrew Solovay [Tue, 24 Jun 2014 20:04:54 +0000 (13:04 -0700)]
docs: Fixed instructions on checking VM version.
Per IRogers@ , you check the VM version by calling
System.getProperty("java.vm.version") -- not, as previously
documented, "dalvik.vm.version" (Ian says there's no such property as
dalvik.vm.version.) BDC@ and/or AnwarG@, can you confirm?
Revised doc is staged to:
http://asolovay.mtv:9001/guide/practices/verifying-apps-art.html#GC_Migration
bug:
15836664
Change-Id: Ie5e2e058fa9ce033afd18a0f4079faa81bbf317e
Ricardo Cervera [Tue, 24 Jun 2014 21:37:00 +0000 (21:37 +0000)]
Merge "docs: Replaced gifs" into klp-modular-dev
Ricardo Cervera [Tue, 24 Jun 2014 17:35:49 +0000 (10:35 -0700)]
docs: Replaced gifs
Change-Id: I043d3f6dace9294e6a50bdf181b38f701d4d8c1c
Robert Ly [Tue, 24 Jun 2014 03:01:57 +0000 (03:01 +0000)]
Merge "docs: fix blog post link, add arm image, fix ecosystem text" into klp-modular-dev
Robert Ly [Mon, 23 Jun 2014 22:39:15 +0000 (15:39 -0700)]
docs: fix blog post link, add arm image, fix ecosystem text
Change-Id: I1fab7f67d99ca787a6057c89b90e2892241df1d3
Robert Ly [Tue, 24 Jun 2014 01:38:44 +0000 (01:38 +0000)]
Merge "docs: Updates to the L Preview Highlights." into klp-modular-dev
Robert Ly [Tue, 24 Jun 2014 01:36:37 +0000 (01:36 +0000)]
Merge "docs: Updates for L Preview Support page." into klp-modular-dev
Quddus Chong [Tue, 24 Jun 2014 01:07:02 +0000 (18:07 -0700)]
docs: Updates for L Preview Support page.
Change-Id: Ib620eb547d34042864b5f9b9af11a5dbd8507e8c
Ricardo Cervera [Tue, 24 Jun 2014 00:49:14 +0000 (17:49 -0700)]
docs: Removed para based on copy review from Auto landing page.
Change-Id: I4bbc3d1d8997b6675efb631081edec2537b2141d
Quddus Chong [Mon, 23 Jun 2014 19:34:59 +0000 (12:34 -0700)]
docs: Updates to the L Preview Highlights.
Change-Id: I085174255e3b45fcdb320fe94a091c7975e80b61
Robert Ly [Mon, 23 Jun 2014 22:06:39 +0000 (22:06 +0000)]
Merge "docs: fix lmp and index pages" into klp-modular-dev
Ricardo Cervera [Tue, 24 Jun 2014 00:39:59 +0000 (00:39 +0000)]
Merge "docs: Added three columns on the Auto SDK." into klp-modular-dev
Ricardo Cervera [Tue, 24 Jun 2014 00:04:53 +0000 (17:04 -0700)]
docs: Added three columns on the Auto SDK.
Also updated the images from the design guys.
Change-Id: Idca893d461dd8a1d8374774c9eac670f1bc78d49
Brian Carlstrom [Fri, 13 Jun 2014 22:19:10 +0000 (15:19 -0700)]
Add missing class to preloaded-classes for ART build
Change-Id: I391dcd9b3f88f5733c28498055f23801ff10948b
Katie McCormick [Thu, 29 May 2014 00:31:23 +0000 (17:31 -0700)]
Doc update: GCM changes for I/O.
Fixes for:
b/
15348323
b/
15349955
b/
15330953
Change-Id: Ie256a76ea83cf16256cded858531dd78b8da0558
Quddus Chong [Mon, 23 Jun 2014 23:02:40 +0000 (23:02 +0000)]
Merge "docs: Updated L Preview Support page." into klp-modular-dev
Quddus Chong [Mon, 23 Jun 2014 16:45:54 +0000 (09:45 -0700)]
docs: Updated L Preview Support page.
Change-Id: I2bc88a15000c7023041b13de7ffe7d186067a0a6
Robert Ly [Mon, 23 Jun 2014 20:21:10 +0000 (13:21 -0700)]
docs: fix lmp and index pages
Change-Id: Iacdc52e1514728aa81192f2b9b1ca146b39bc024
Robert Ly [Mon, 23 Jun 2014 18:24:07 +0000 (11:24 -0700)]
fix resources js bug
Change-Id: Ic44c324bd61069c4a9b3bc05251683b6c586d3b8
smain@google.com [Mon, 23 Jun 2014 17:28:04 +0000 (10:28 -0700)]
update landing page gif frame to use new style
Change-Id: I27e32cccbe64fbe32306c1404edd7f965f9ed299
Robert Ly [Mon, 23 Jun 2014 20:16:27 +0000 (20:16 +0000)]
Merge "docs: Fix auto site css for screenshot frames." into klp-modular-dev
Ricardo Cervera [Mon, 23 Jun 2014 20:11:30 +0000 (13:11 -0700)]
docs: Fix auto site css for screenshot frames.
Change-Id: Ied72b6c90af93ae522ae4478dcdd60b3abd39350
OSDN Git Service
