Commit Graph

15251 Commits

Author SHA1 Message Date
Ying Wang
1343ec169c am b75fe469: am eafdd2cd: Fix emulator builds
* commit 'b75fe4696e847ef49aa9b11693243c00de497808':
  Fix emulator builds
2014-06-04 22:24:51 +00:00
Ying Wang
b75fe4696e am eafdd2cd: Fix emulator builds
* commit 'eafdd2cd878c8fd23033302a2c5010505412981f':
  Fix emulator builds
2014-06-04 22:21:38 +00:00
Ying Wang
eafdd2cd87 Fix emulator builds
which don't have boot.img.

Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
2014-06-04 15:16:17 -07:00
Ying Wang
dc7ff05427 am bc080d51: am 2a386e0c: Allow to build the update.zip for emulator build.
* commit 'bc080d510f022da8055b89b85e02d91e74c3757d':
  Allow to build the update.zip for emulator build.
2014-06-04 17:26:00 +00:00
Ying Wang
bc080d510f am 2a386e0c: Allow to build the update.zip for emulator build.
* commit '2a386e0cfbdfa009038acede85876a7643f297f5':
  Allow to build the update.zip for emulator build.
2014-06-04 17:22:21 +00:00
Ying Wang
2a386e0cfb Allow to build the update.zip for emulator build.
img_from_target_files.py just skips the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
2014-06-04 17:04:14 +00:00
Dirk Dougherty
cfdf93c003 am 201cdd30: am 600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '201cdd30e07ecddb333b4e347fbf14493fd2643c':
  css adjustments for headings with dynamic content
2014-06-03 23:14:41 +00:00
Dirk Dougherty
201cdd30e0 am 600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '600e588e9902c4bf3e0fd567a9338a5381249ba3':
  css adjustments for headings with dynamic content
2014-06-03 23:10:24 +00:00
Dirk Dougherty
600e588e99 Merge "css adjustments for headings with dynamic content" into klp-docs 2014-06-03 23:08:13 +00:00
Dirk Dougherty
e473e9bdc9 am 706bb0eb: am 44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '706bb0eb6455a7775596a87c9d515113e227c571':
  Add universal analytics code.
2014-06-03 23:01:49 +00:00
Dirk Dougherty
706bb0eb64 am 44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '44b740e7e556f60b36a45a4a386157f55981df8e':
  Add universal analytics code.
2014-06-03 22:59:49 +00:00
Dirk Dougherty
44b740e7e5 Merge "Add universal analytics code." into klp-docs 2014-06-03 22:56:51 +00:00
Scott Main
88c6d8d33e am 8c02b1ac: am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '8c02b1ac514b5757aad7d2736ed97bcbff7c7d58':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 02:15:56 +00:00
Scott Main
8c02b1ac51 am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '7a7abbdb101cd1094e5c2a72a4733e4800824c76':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 02:12:01 +00:00
Dirk Dougherty
44ed861279 Add universal analytics code.
Change-Id: I3b565a1cd422c5cbd3da8560e533741b880615a7
2014-06-02 19:07:37 -07:00
Scott Main
7a7abbdb10 Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs 2014-06-03 02:06:33 +00:00
Dirk Dougherty
2e3fb81b52 css adjustments for headings with dynamic content
Change-Id: I54e184b10677b21003bd282919423b525b8aa705
2014-06-01 21:28:20 -07:00
Dirk Dougherty
e445387e56 am e2adcfef: am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit 'e2adcfefd32338cacd9837ba18e310f7c647e766':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 11:44:03 +00:00
Dirk Dougherty
e2adcfefd3 am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit '518ed145b17ad1fa66a0b8238469b6d13819f008':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 11:09:48 +00:00
Dirk Dougherty
518ed145b1 Fix g-plusone data-href references for cards pointing to static content.
Change-Id: I762e098db2c51c5687e9727b83bddb2a891ac289
2014-05-30 21:24:42 -07:00
Scott Main
06f3f2c148 fix bug in chrome with anchors not scrolling into view on new pages.
added a 100ms delay to the scroll offset because chrome does not
immediately scroll the page to the anchor on page load.

Change-Id: Ib10cfecfe63d9d9220170842f4c8941557c0eb06
2014-05-30 11:42:23 -07:00
Scott Main
04f811c80e am 573db58e: am ea98c841: Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
* commit '573db58ef78a1cd80845204c6e5141a6205aa305':
  update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
2014-05-29 22:54:12 +00:00
Scott Main
573db58ef7 am ea98c841: Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs
* commit 'ea98c8413390cf228d4c16fc35a7fdc92109eded':
  update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0
2014-05-29 22:42:16 +00:00
Scott Main
ea98c84133 Merge "update css for header offset alignment and remove obsolete h1 styles for distribute docs. cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0" into klp-docs 2014-05-29 22:33:55 +00:00
Scott Main
ed02b7fb12 am 8b2be3d8: am f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit '8b2be3d81d780e0549907b58ebf860e0cbbabd07':
  fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
2014-05-23 21:52:47 +00:00
Scott Main
8b2be3d81d am f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
* commit 'f525781ea843cd6518f45c0146074e335b942a2a':
  fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
2014-05-23 21:49:16 +00:00
Scott Main
e280837053 am c0387cd0: am e7d75351: when generating training course pages, use localized descriptions when available
* commit 'c0387cd0f156b9e657e72ca2e24d402e5e0fe57c':
  when generating training course pages, use localized descriptions when available
2014-05-23 00:38:23 +00:00
Scott Main
c0387cd0f1 am e7d75351: when generating training course pages, use localized descriptions when available
* commit 'e7d75351a9918716e75db57cc04baa46a64bf447':
  when generating training course pages, use localized descriptions when available
2014-05-23 00:33:59 +00:00
Scott Main
f525781ea8 fix regression with horizontal scroll so the sidenav moves
with the rest of the content when the sticky bar is visible

Change-Id: I6c310405c15a8f74719b895f14eb5f4780277845
2014-05-22 17:30:43 -07:00
Scott Main
e7d75351a9 when generating training course pages, use localized descriptions when available
Change-Id: I1b5078e04b440bf5dff71dc31333bcf1d2202ff9
2014-05-22 16:23:48 -07:00
Scott Main
91b555710c update css for header offset alignment
and remove obsolete h1 styles for distribute docs.
cross-dependency with CL I023fdd70a7071cbb7a8dfde853f1393eb6c59fa0

Change-Id: I9dc175057b6e452cc2754a7da0ee73179c6e8299
2014-05-22 11:30:14 -07:00
Scott Main
0250f80ef0 am e8a3139e: am b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
* commit 'e8a3139ebfa103ff2b0ae1dd98abe37186ecbaad':
  Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
2014-05-22 14:58:15 +00:00
Scott Main
e8a3139ebf am b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
* commit 'b16376f2e600008c0d7233a919edf02a30237a9a':
  Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug: 15129373
2014-05-22 14:51:08 +00:00
Scott Main
b16376f2e6 Change scroll position with javascript instead of CSS.
Makes scroll adjustment work for all types of anchors.
bug: 15129373

Change-Id: I0f934170613e8a60d94f09192e03117b8e9d4852
2014-05-21 20:47:42 -07:00
Justin Koh
3bb81eb04d Merge "Set API version for KKWT. DO NOT MERGE" into klp-modular-dev 2014-05-21 02:42:33 +00:00
Scott Main
a8fcb35ec1 am e0968f0e: am c426499e: add 2x version of logo for sticky bar
* commit 'e0968f0e7027f894f3ff5a630720f12016d7202b':
  add 2x version of logo for sticky bar
2014-05-20 17:19:22 +00:00
Scott Main
e0968f0e70 am c426499e: add 2x version of logo for sticky bar
* commit 'c426499ee8e8a3f6df85e46930a6c5aec9cf3d25':
  add 2x version of logo for sticky bar
2014-05-20 17:16:03 +00:00
Scott Main
c426499ee8 add 2x version of logo for sticky bar
Change-Id: I5127d308ee820d4e77798ebe4aaa0f385b797383
2014-05-20 10:11:17 -07:00
Ben Murdoch
0861ed07f0 Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev 2014-05-20 11:06:35 +00:00
Ben Murdoch
cf8cd38fac Merge "All devices that depend on WebView must have the system feature." into klp-modular-dev 2014-05-20 11:06:08 +00:00
Dirk Dougherty
63168ffff8 am b4cb3ebc: am ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit 'b4cb3ebc37423db5dc5b5327999d7efe874d7148':
  Minor fixes for handling cross-browser load issues and positioning of #headings.
2014-05-19 18:08:50 +00:00
Dirk Dougherty
b4cb3ebc37 am ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit 'ca1230c9a251fd0eaf68665c424a69442f717df1':
  Minor fixes for handling cross-browser load issues and positioning of #headings.
2014-05-19 17:24:15 +00:00
Ben Murdoch
0b4abb9a77 Have core_tiny depend on the NullWebView.
Tiny devices do not support a functioning WebView.

Depends on I6afa169fa31db82c45c0a507e265301e48ac79dc

Bug: 13438487
Change-Id: I5f6e115ee569848d0494e0dd52ef037e3a0ee84e
2014-05-19 11:09:53 +00:00
Dirk Dougherty
ca1230c9a2 Minor fixes for handling cross-browser load issues and positioning of #headings.
Change-Id: I276b07cd85cc0e1edaede027b3dc3e4b1d24dcd7
2014-05-18 22:10:43 -07:00
Justin Koh
3446af6977 Add CalendarProvider to core_tiny
This is required for CTS.
Bug: 15003038

Change-Id: I9ac43f4875e979b086c88859a09626254f3ad06a
2014-05-16 11:30:06 -07:00
Justin Koh
f6c21e7262 Set API version for KKWT. DO NOT MERGE
Set API level and version string for KKWT.

Change-Id: I18178e9286e6115f4f7273d4489dd91b3205e5cf
2014-05-14 18:57:42 -07:00
Dirk Dougherty
7db3e8a518 am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '9890fe24f1451d0393337904852d0ca24808c2bc':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 20:56:51 +00:00
Dirk Dougherty
9890fe24f1 am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit 'c3921656f544af2fac99c3fab9ea5139150d45a2':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 20:53:13 +00:00
Dirk Dougherty
c3921656f5 Add templates support for dynamic content and sticky nav bar.
Change-Id: Icb4e492a991a19e3e1eac72eafc83623b00be5de
2014-05-14 12:00:34 -07:00
Kenny Root
abe426663a Move libkeystore to minimal
The ENGINE needs to be included to make the keystore useful, so if
keystore is included, also include libkeystore.

Change-Id: I042a4eb02450d090f10437deb736e1c4a4105df7
2014-05-14 11:50:35 -07:00