Commit graph

15265 commits

Author SHA1 Message Date
Scott Main
35fcac0f41 am 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead of hyphen
* commit '70c9c2d82ba5d4647fdc6552a21130b19281849a':
  fix viewport width variable by using underscore instead of hyphen
2014-03-27 20:14:03 +00:00
Scott Main
70c9c2d82b am a36253b8: fix viewport width variable by using underscore instead of hyphen
* commit 'a36253b8b05d94fb27a67522757b07781da2bd43':
  fix viewport width variable by using underscore instead of hyphen
2014-03-27 20:08:18 +00:00
Scott Main
a36253b8b0 fix viewport width variable by using underscore instead of hyphen
Change-Id: I866fa7016453b9e242df5e68f26bf94eac672feb
2014-03-27 12:56:26 -07:00
Scott Main
bb3ed6fb47 am b8702917: am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
* commit 'b8702917c61923bc4dc5f6284482e1296b783bd4':
  add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
2014-03-27 03:23:11 +00:00
Scott Main
97d326ea19 am 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite
* commit '514c8254d0a78a4153c442bc0789da8a10ce8b0b':
  Update the sdk templates to support the Android Wear microsite
2014-03-27 03:23:11 +00:00
Scott Main
b8702917c6 am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
* commit '75f21bc79e18f5bdf7676eeab6681e8f4a32e688':
  add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
2014-03-27 03:17:10 +00:00
Scott Main
514c8254d0 am 4b270cdf: Update the sdk templates to support the Android Wear microsite
* commit '4b270cdf3678998370c2c3629711797ec7ab8a5a':
  Update the sdk templates to support the Android Wear microsite
2014-03-27 03:17:09 +00:00
Scott Main
75f21bc79e Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs 2014-03-27 03:15:19 +00:00
Scott Main
e921b6dedc add 2x header logo and add override to viewport width for landing pages.
changing the viewport to 970 ensures proper layout space for floating divs.

Change-Id: Iea980b4dfe1cca8a2b517f171a847a0e2788b1f0
2014-03-26 20:12:35 -07:00
Scott Main
4b270cdf36 Update the sdk templates to support the Android Wear microsite
Change-Id: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-26 19:04:26 -07:00
Xavier Ducrohet
7c629a728f am cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit 'cc85124393c438986e6639bc90906edf2dc2ca7a':
  Add annotation support lib.
2014-03-26 18:10:46 +00:00
Xavier Ducrohet
cc85124393 Merge "Add annotation support lib." into klp-ub-dev 2014-03-26 18:06:40 +00:00
Xavier Ducrohet
ef04682fdf Add annotation support lib.
Change-Id: I5a4ddbdf09a09db944e16ed6baab604aa1710974
2014-03-26 10:50:38 -07:00
Ricardo Cervera
d9bc3eda8f am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit '49b4ef0badd51ce3af0511206e20114414a6c427':
  docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 20:33:03 +00:00
Ricardo Cervera
49b4ef0bad am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit 'fd0be925bb6e34768f9f11cf5325d1fcfbf39410':
  docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 20:27:48 +00:00
Ricardo Cervera
fd0be925bb docs: Added SDK version to the ADT bundles download path in the CS template.
Change-Id: Ib222684754779b908cb10e6d8f9e5778101c9b96
2014-03-25 12:33:33 -07:00
Ying Wang
78a819d600 am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '266cf4f2595323170fe02db05835884b4522a0f9':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
2014-03-25 09:56:52 +00:00
Ying Wang
266cf4f259 am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit 'f39752e99b4e5083f1e91c46722f87def8143b49':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
2014-03-24 21:21:26 +00:00
Mark Renouf
37f3c5cc1d Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Change-Id: I8a6bad054ac22592f0d341bb3ebbe4cc74828698
2014-03-21 11:50:35 -04:00
Ying Wang
f39752e99b Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Bug: 11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0
2014-03-20 17:28:57 -07:00
Tim Kilbourn
8acc8da42d Add v17/leanback to pathmap.
Change-Id: I3032710da8cf8714516bf78f0971223257dfe1ec
2014-03-18 15:20:15 -07:00
Scott Main
7250ac63e5 am bb79f9d2: am b7b49711: add some css to support android wear sub-site
* commit 'bb79f9d2a52c7f1e20bd74e5d80b2df4119cec82':
  add some css to support android wear sub-site
2014-03-18 12:37:22 +00:00
Dianne Hackborn
45b9be37a5 am 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version boogaloo!
* commit '264d4001e7d01e302f93803d161f778fb200e346':
  4.4.3 is MR2, version boogaloo!
2014-03-18 12:37:22 +00:00
Scott Main
bb79f9d2a5 am b7b49711: add some css to support android wear sub-site
* commit 'b7b497115fb19d17a3e5de20646a5eac759c0095':
  add some css to support android wear sub-site
2014-03-18 12:35:42 +00:00
Scott Main
b7b497115f add some css to support android wear sub-site
Change-Id: Ibce2c596219fb86f433075c88a0af9d0cc1007b3
2014-03-18 05:32:26 -07:00
Dianne Hackborn
264d4001e7 am 7503e736: 4.4.3 is MR2, version boogaloo!
* commit '7503e736ebb0161a23ff0ee39a307cd436ea8afc':
  4.4.3 is MR2, version boogaloo!
2014-03-11 23:22:38 +00:00
Dianne Hackborn
7503e736eb 4.4.3 is MR2, version boogaloo!
Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26
2014-03-11 14:54:09 -07:00
Adam Hampson
57afaa5373 Add init.environ.rc to installclean
BOOTCLASSPATH needs to be rebuilt when switching between build
targets.

Bug: 13282187

Change-Id: I16816abb4246878a60e1aa8c91b6b38c7339950e
Signed-off-by: Adam Hampson <ahampson@google.com>
2014-03-07 15:55:18 -08:00
Griff Hazen
433febb3c4 Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
Change-Id: Iecea3f3af628d89df65a44293a977b2bce35bf28
2014-02-28 08:45:59 -08:00
Ying Wang
0c0a4ce8f4 Remove the default sdk.atree if custom one is set.
Change-Id: I5d20b030db5ef29d7ff6eb64a0a1e11a4283e85d
2014-02-18 14:33:25 -08:00
Ying Wang
6ca56b6ae7 Merge "Make the module existence check nonfatal" into klp-modular-dev 2014-02-18 19:11:50 +00:00
Dirk Dougherty
98756f3b7e am 8a56079c: am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.
* commit '8a56079c74765afa405a96bd025f2bddac4e17b6':
  New temporary templates set for dynamic content support.
2014-02-15 18:16:51 +00:00
Dirk Dougherty
8a56079c74 am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.
* commit '5c92d966076b28024a9efd6c8456445e207748f1':
  New temporary templates set for dynamic content support.
2014-02-15 18:14:37 +00:00
Dirk Dougherty
5c92d96607 am 541b4941: New temporary templates set for dynamic content support.
* commit '541b494103857da31505ba745b0da5bdbe0499b9':
  New temporary templates set for dynamic content support.
2014-02-15 18:12:08 +00:00
Dirk Dougherty
541b494103 New temporary templates set for dynamic content support.
Change-Id: I066e43cdebaf66c0d8b5e3622a286dc2c88c47b5
2014-02-14 18:31:53 -08:00
Ying Wang
b1d75bd81d Make the module existence check nonfatal
Now we have sdk variants that may inherit the non-existent module names
from the device product.

Change-Id: Ibe96a33cde650fd79ae4731561dcb674203c3b91
2014-02-14 13:39:42 -08:00
Ying Wang
fd841351ef Merge "Support custom sdk.atree files." into klp-modular-dev 2014-02-12 20:54:30 +00:00
Scott Main
83aeb2f942 am e2652df8: am 22866695: am 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit 'e2652df8d7411854b3b00adf7c6a6a0af99a545d':
  set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:08:32 +00:00
Scott Main
e2652df8d7 am 22866695: am 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit '228666956ade81aa8f993eed70f361ec93073bad':
  set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:06:03 +00:00
Scott Main
228666956a am 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit '2c2c053490aa3a2102c0dce95fcae0d22b77a71b':
  set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:02:57 +00:00
Scott Main
2c2c053490 set a smaller line height for sidebox headers to avoid whitespace at the top
Change-Id: I8f1c4de275f3d7b2f55460bf4dc32a9a3d6b04ae
2014-02-11 18:16:20 -08:00
Justin Koh
f0c58da07d Change core_tiny to not be minimal font footprint.
Change core_tiny to not be minimal font footprint: UX really wants roboto
condensed. Checked /proc/meminfo before and after the change and didn't
see much difference.

Change-Id: I94072f674ff678dfdbddd66d3792e63245e5e7da
2014-02-11 10:28:11 -08:00
Ying Wang
2d72094f06 am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
* commit '960d919e814726f05ad1a9b82e6a9677f9977f15':
  Allow proguarding the main app and the test app in a single run.
2014-02-08 18:35:13 +00:00
Ying Wang
960d919e81 resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6
2014-02-08 10:31:46 -08:00
Mihail Dumitrescu
4df82b3e30 Allow proguarding the main app and the test app in a single run.
Bug: 12895101
Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
2014-02-07 19:11:24 +00:00
Ying Wang
dc7fee9fbf Set up rules to merge AndroidManifest.xmls
Now you can merge the library manifest files to the main app's
AndroidManifest.xml with LOCAL_FULL_LIBS_MANIFEST_FILES.
LOCAL_FULL_LIBS_MANIFEST_FILES is a list of paths relative to the top of
the source tree.

Bug: 12907528
Change-Id: I16a347c83dfb6fbbb7d5d40284b7c65aa682fdd2
2014-02-05 18:24:45 -08:00
Adam Lesinski
7b734fd8d1 Merge "Allow multiple asset directories in aapt" into klp-modular-dev 2014-02-05 00:47:00 +00:00
Adam Lesinski
64cf9807b9 Allow multiple asset directories in aapt
AAPT already supports this.

Change-Id: I293c7543fb43b15eedf2162416da48915ce02db8
2014-02-05 00:13:58 +00:00
Justin Koh
303d275591 Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed.

Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c
2014-02-03 16:26:43 -08:00
Noreen Tolland
c816e06127 Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev 2014-01-31 23:13:24 +00:00