Amanda Kassay
4a6a7114b3
Migrating web search api to custom search api on templates-sdk am: 843649b
am: e774264
...
am: 3752b5e
* commit '3752b5e5b7255d4b30e886ef13f16f1bea1c7dc8':
Change-Id: I291dc31011cf081dc8fe0161a50d2ab9e155f8f5
2016-04-26 03:57:00 +00:00
smain@google.com
ebb074eca2
new search results layout. no more custom suggestions; just API matches and organic results. am: 38b0e22
am: 4f9a67d
...
am: 0b4b80b
* commit '0b4b80b774ec1ba6e383e2b7c697bb274abd2150':
Change-Id: I6d7fde3bc951a7dbd9bb9440baa23a0374805634
2016-04-26 03:56:58 +00:00
smain@google.com
9368e05680
remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages am: 1c8d4a4
am: b7595b8
...
am: f1a8ed8
* commit 'f1a8ed83a30f7421c170d33da3a799226a4020f3':
Change-Id: I6204cc7b40d10e5a76bae65417b69754fa8cf5fc
2016-04-26 03:56:56 +00:00
Amanda Kassay
ca9979e1b6
Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer. am: e4a8ab1
am: 5494db7
...
am: d04c560
* commit 'd04c56090a5ffcdd2459d8714cf2773b0d8ef8c2':
Change-Id: Ifc13976e975d2a439c2887537fdaead1111aee8d
2016-04-26 03:56:54 +00:00
Dirk Dougherty
88db402e16
Update samples_navtree cs template to include generated _yaml from samples TOC. am: 1a2dbb6
...
am: 0781792
* commit '0781792ea7ba4b284f5e5ea1b7b44ec77ace7742':
Update samples_navtree cs template to include generated _yaml from samples TOC.
Change-Id: I4365afb722b0b5ca56f5238612da0d75444fe02a
2016-04-26 03:52:30 +00:00
smain@google.com
f5c472b724
remove version number from download button at bottom of page. am: 4194fc5
am: cdb2751
...
am: 15dde75
* commit '15dde75ca286eb5faae912b612683d93e12ea36a':
remove version number from download button at bottom of page.
Change-Id: I6feb68b32455ca27171b32ff34da681d55dd2d3b
2016-04-26 03:52:29 +00:00
smain@google.com
ce735dfad2
remove version number from download button at bottom of page. am: ba761ab
...
am: fbbd3fa
* commit 'fbbd3faebd383f86a0befbb4d9a9e0b0d1fd5d02':
remove version number from download button at bottom of page.
Change-Id: I9553335b7e9cb4c3eed12302af300eff55f56a60
2016-04-26 03:52:29 +00:00
Amanda Kassay
6e66602444
Fix for double header and footer on ndk download pages: b/27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html am: 01febb9
...
am: 9ba538e
* commit '9ba538ee05e08c099253291494ca3a9420ca30f6':
Fix for double header and footer on ndk download pages: b/27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html
Change-Id: If1e8cfe488b6b970ad7ee640e817b5e8d4482a73
2016-04-26 03:52:29 +00:00
Scott Main
f11a8493fd
Merge "Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there\'s only one level of "tabs"" into mnc-mr-docs am: 848295a
...
am: 7013662
* commit '70136620b6db6b6e6ad69a3eb9b3ad65e3a2edc2':
Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there's only one level of "tabs"
Change-Id: I4753951b152e35703c01c8cb06373b63ac55b3dd
2016-04-26 03:52:28 +00:00
Amanda Kassay
06abbd3140
Added html escape for search queries to fix XSS issue b/28135307 am: 2bb3328
...
am: b32745e
* commit 'b32745ef8d8558cfae01e04c373d54298634ba47':
Added html escape for search queries to fix XSS issue b/28135307
Change-Id: I81ac6c86286a142ee67848b172ad9ee2aa0bc5b1
2016-04-26 03:52:28 +00:00
smain@google.com
0e7d143722
change order of windows downloads am: 6e90dbf
...
am: 77ed554
* commit '77ed554f6f0e2e99dbb6f206b9c1eade0fe7f0bf':
change order of windows downloads
Change-Id: I7fcbbeb9ab45aaaa7a7e7e76c6f557b4f3f358ef
2016-04-26 03:52:28 +00:00
smain@google.com
25afc407a4
clarify what\'s in each windows package and rename the other packages to command line tools am: 6b2a986
...
am: 6e56ea1
* commit '6e56ea19aa90fbc6e385e33e60271985a8c422bc':
clarify what's in each windows package and rename the other packages to command line tools
Change-Id: Ie9434b0567d5f6b06fe2b9fad9d486c0e58e3c76
2016-04-26 03:52:27 +00:00
Amanda Kassay
fafd07a6b9
Tabs js error fix, DevSite css issues fix, Search filtering am: ebcf397
...
am: 7a697e7
* commit '7a697e73cb44fa401b42cfa46f4478e634ca39bc':
Change-Id: I18be4cc3d6207f067ff72245d437616817bba6b8
2016-04-26 03:52:26 +00:00
smain@google.com
d82c81c5d4
new styles and tab-highlighting to support custom Android Studio site design am: 190e610
...
am: 7a7b964
* commit '7a7b9648145b47a292f7623d6e464b4486925703':
Change-Id: I770fc065da8129cfc18f692291516ea10f7d35de
2016-04-26 03:52:26 +00:00
smain@google.com
4d55347713
tweak the NDK download analytics event tag am: 7281802
...
am: 2f7c889
* commit '2f7c889e9d87771567afd62dec7556d7c21a4a53':
Change-Id: Ibd474c9890e336eb685d957a15570767ec87976e
2016-04-26 03:52:25 +00:00
Dirk Dougherty
b969b1586a
Update modal download dialogs for sdk/ndk download. Revise the redirect behavior once download completes. Add more appropriate title and download message when installing SDK tools only. Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state. Add styles for the Studio download page. am: c607a4d
...
am: 29e355b
* commit '29e355b2913349274cff1fce917b688bde24b76f':
Change-Id: I8a86e2a03d47a96b32451f38df49817d8a850bf6
2016-04-26 03:52:24 +00:00
Dirk Dougherty
669d03418e
increment version for fetched js and cs files to avoid proxy caching. am: 0d268be
...
am: 248ef8d
* commit '248ef8d191dd4288f09ee6ba4a2349cc8847b2ec':
Change-Id: I314f91f16effc570a6a0d1baf15b5afb1d039a79
2016-04-26 03:52:23 +00:00
Amanda Kassay
3752b5e5b7
Migrating web search api to custom search api on templates-sdk am: 843649b
...
am: e774264
* commit 'e774264f515279e9030bc980bd8a5e83479ead18':
Change-Id: I98771a8e82474e5f6728642fb6c3eb30a2003142
2016-04-26 03:52:22 +00:00
smain@google.com
0b4b80b774
new search results layout. no more custom suggestions; just API matches and organic results. am: 38b0e22
...
am: 4f9a67d
* commit '4f9a67dbb37abda3d6ccea540c4fa827141ca2dc':
Change-Id: I9225b324395c0ecf0de29a5b955cf2f335615105
2016-04-26 03:52:21 +00:00
smain@google.com
f1a8ed83a3
remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages am: 1c8d4a4
...
am: b7595b8
* commit 'b7595b8256de938a5461c7f2221f9c7c40eb0406':
Change-Id: I35b2b7e59416120524c364c272869cdd35ce2fd4
2016-04-26 03:52:20 +00:00
Amanda Kassay
d04c56090a
Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer. am: e4a8ab1
...
am: 5494db7
* commit '5494db7fdb4f1f810239a63d2976eb6fa1ff2d92':
Change-Id: I94795ed54be71860b4b523453161f214394a19f9
2016-04-26 03:52:19 +00:00
Baligh Uddin
8f091f6d74
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools am: 69cf5df
-s ours
...
am: b664e90
-s ours
* commit 'b664e9074facc99748bcf91ec913c302cf930fbf':
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
Change-Id: I7063cddb2b6c5ec6691b386daf1a26b48723f764
2016-04-25 23:47:24 +00:00
Igor Murashkin
1cb8adb1fa
Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev
2016-04-25 23:39:16 +00:00
Mohamad Ayyash
1868a601b7
Rename incr ext4 base_fs path vars. Add to product_var_list.
...
BUG: 27698960
Change-Id: I4624f782846ee54525d0ac29b866a04c0d67aa40
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-25 15:47:42 -07:00
Keun Soo Yim
72b82dcf35
Merge "build rule change for VTS (vendor test suite)'s metadata files" into nyc-dev
2016-04-25 21:57:13 +00:00
TreeHugger Robot
1c04ad1b02
Merge "Add fake libart" into nyc-dev
2016-04-25 21:53:31 +00:00
Keun Soo Yim
3d4847525f
build rule change for VTS (vendor test suite)'s metadata files
...
Change-Id: I76b81529a97b672e08632703d2f6a2777ee8811e
2016-04-25 13:06:57 -07:00
Dirk Dougherty
0781792ea7
Update samples_navtree cs template to include generated _yaml from samples TOC.
...
am: 1a2dbb6
* commit '1a2dbb64a897f684667da6c3c2faeb88f4564123':
Update samples_navtree cs template to include generated _yaml from samples TOC.
Change-Id: I5d95e8744a5451c0442b7b67ecb8c84bbf4b107f
2016-04-25 18:46:10 +00:00
Dirk Dougherty
1a2dbb64a8
Update samples_navtree cs template to include generated _yaml from samples TOC.
...
Change-Id: Ied2bd5b3e58d9eb2c10e8bc10678aa5d02ef1794
2016-04-25 11:26:11 -07:00
smain@google.com
15dde75ca2
remove version number from download button at bottom of page. am: 4194fc5
...
am: cdb2751
* commit 'cdb27514f91f9790a8916eb1e4e16f8d6a2f3d76':
remove version number from download button at bottom of page.
Change-Id: If1a0c80bd8d80955d4bb71f47efbd8961c0ce5c3
2016-04-25 18:08:53 +00:00
smain@google.com
cdb27514f9
remove version number from download button at bottom of page.
...
am: 4194fc5
* commit '4194fc52a57178ac5db68b025635accf05e3bce0':
remove version number from download button at bottom of page.
Change-Id: I80310ef73bfbba642fa35802d356360cd33a01e8
2016-04-25 18:03:27 +00:00
smain@google.com
fbbd3faebd
remove version number from download button at bottom of page.
...
am: ba761ab
* commit 'ba761ab3333d86eeaa6bf2f4972ed7bd70ac2f7d':
remove version number from download button at bottom of page.
Change-Id: Iedbdca047db7779415ae55a29291cec8b1b9fa26
2016-04-25 18:03:27 +00:00
smain@google.com
4194fc52a5
remove version number from download button at bottom of page.
...
Change-Id: I4e2b510a0ff88b987b5b9a65b6a7e89d043e946a
(cherry picked from commit ba761ab333
)
2016-04-25 17:58:05 +00:00
smain@google.com
ba761ab333
remove version number from download button at bottom of page.
...
Change-Id: I4e2b510a0ff88b987b5b9a65b6a7e89d043e946a
2016-04-25 10:56:30 -07:00
Tao Bao
f31a6deeee
target_files_diff: Fix the issue with file type change.
...
When a file is switched from a regular file to a symlink, we should skip
the comparasion.
Bug: 28373409
Change-Id: I8fef00ab9f2d6f811fde1cadf595e8bd46af2dfd
2016-04-25 10:07:20 -07:00
Baligh Uddin
f3b80aed0a
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
...
Bug: 23967152
2016-04-25 08:25:22 -07:00
Baligh Uddin
b664e9074f
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
...
am: 69cf5df
-s ours
* commit '69cf5dfc4deee1a0d48e205c3420f5a60020bb41':
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
Change-Id: I324adea1d5eee7b1c7ebddb119f63861c6559944
2016-04-24 19:46:27 +00:00
Baligh Uddin
69cf5dfc4d
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
...
Bug: 23967152
2016-04-24 12:40:03 -07:00
Zach Jang
b5658074c3
Update security patch string to 2016-06-01 am: 0a3b3d4
am: 0ca3757
am: 05a8c77
am: d4b8d2b
am: 63398dd
am: d402579
...
am: 3f578d2
* commit '3f578d27312e5c075daf7e66787a1b4fe64a8a4e':
Update security patch string to 2016-06-01
Change-Id: Ia5b128d3719872fd991417620e9bee82dbc5da24
2016-04-20 22:11:57 +00:00
Chris Tate
8e9431e54f
Merge "Wallpaper backup/restore is now in its own package" into nyc-dev
2016-04-20 22:10:40 +00:00
Zach Jang
3f578d2731
Update security patch string to 2016-06-01 am: 0a3b3d4
am: 0ca3757
am: 05a8c77
am: d4b8d2b
am: 63398dd
...
am: d402579
* commit 'd402579bc0beb02007172259c0c686b930cc77d4':
Update security patch string to 2016-06-01
Change-Id: I4b9b46ae2fec761ec84cec722d652658bf5489e0
2016-04-20 21:55:11 +00:00
Zach Jang
d402579bc0
Update security patch string to 2016-06-01 am: 0a3b3d4
am: 0ca3757
am: 05a8c77
am: d4b8d2b
...
am: 63398dd
* commit '63398dd7ea01ea331e2ea362c3235b79fefd5cfe':
Update security patch string to 2016-06-01
Change-Id: Icea8df8e59f72146ecf737473cbba19d0b6aba5d
2016-04-20 21:47:54 +00:00
Zach Jang
63398dd7ea
Update security patch string to 2016-06-01 am: 0a3b3d4
am: 0ca3757
am: 05a8c77
...
am: d4b8d2b
* commit 'd4b8d2b59f804544e09cb3e600ff290792470999':
Update security patch string to 2016-06-01
Change-Id: I837a9f96b9d35f315b2bf92e600084ecb879b264
2016-04-20 21:42:16 +00:00
Zach Jang
d4b8d2b59f
Update security patch string to 2016-06-01 am: 0a3b3d4
am: 0ca3757
...
am: 05a8c77
* commit '05a8c77e4231828db15aee343f79ebd2dd6607dd':
Update security patch string to 2016-06-01
Change-Id: I427cd7ac7b33d5f5891ccd96a4fbaeb0a0f7c5e7
2016-04-20 21:35:11 +00:00
Zach Jang
05a8c77e42
Update security patch string to 2016-06-01 am: 0a3b3d4
...
am: 0ca3757
* commit '0ca37573e53bc3a481daa3a807dfc6960227fb0f':
Update security patch string to 2016-06-01
Change-Id: I91bf9e0ce857dbb6cde8132e97499011b2325ba2
2016-04-20 19:50:19 +00:00
Zach Jang
0ca37573e5
Update security patch string to 2016-06-01
...
am: 0a3b3d4
* commit '0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
Update security patch string to 2016-06-01
Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a
2016-04-20 18:49:54 +00:00
Bo Hu
94f576d18c
Merge "Fix emulator specific SELinux denials related to qemu.gles" into nyc-dev
2016-04-20 18:46:38 +00:00
Trevor Johns
0f0b53623e
Merge "Revert "Revert "Merge "Resolve merge conflicts of a5f0068
to nyc-dev" into nyc-dev""" into nyc-dev
2016-04-20 18:35:57 +00:00
TreeHugger Robot
816dd48126
Merge "Make jack_check_timestamp depend on setup-jack-server" into nyc-dev
2016-04-20 01:54:54 +00:00
Colin Cross
febe2bcc21
Make jack_check_timestamp depend on setup-jack-server
...
Some builds were failing with:
[ 3% 2226/61362] /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
FAILED: /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
No Jack server running. Try 'jack-admin start-server'
While jack-admin was running concurrently:
[ 3% 2226/61362] /bin/bash -c "(prebuilts/sdk/tools/jack-admin stop-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin kill-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin uninstall-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin install-server prebuilts/sdk/tools/jack-launcher.jar prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 2>&1 || (exit 0) ) && (mkdir -p \"/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/\" ) && (JACK_SERVER_VM_ARGUMENTS=\"-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log\" prebuilts/sdk/tools/jack-admin start-server 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update server prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 4.8.ALPHA 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-2.28.RELEASE.jar 2.28.RELEASE || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.26.ALPHA.jar 3.26.ALPHA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.27.BETA.jar 3.27.BETA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.30.BETA.jar 3.30.BETA || exit 47 )"
Stopping background server
Killing background server
No Jack server to kill
Removing jack server from "/Users/android-build/.jack-server"
Installing jack server in "/Users/android-build/.jack-server"
Launching Jack server java -XX:MaxJavaStackTraceDepth=-1 -Djava.io.tmpdir=/buildbot/tmp -Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log -cp /Users/android-build/.jack-server/launcher.jar com.android.jack.launcher.ServerLauncher
Change-Id: Ib35f313daee93dc6a3548e652cbcd4cb4d304f93
2016-04-19 17:22:29 -07:00