Commit Graph

19931 Commits

Author SHA1 Message Date
Xavier Ducrohet
e92a523cfe Final API 24 SDK for N.
am: dfbd2eecf2

* commit 'dfbd2eecf2a50bb53bb5990ff26fb6b4837a9e68':
  Final API 24 SDK for N.

Change-Id: If108e75fb287b23545b49386b689c6306d4dfa0a
2016-05-26 04:14:15 +00:00
Xavier Ducrohet
dfbd2eecf2 Final API 24 SDK for N.
Change-Id: Ifd8643ecc2a6787d123e9336be6d75976fb72935
2016-05-25 17:42:59 -07:00
Sebastien Hertz
c016eb3074 Add jack-jacoco-plugin.jar to build tools
am: 882fd85a9b

* commit '882fd85a9bcac712e49960313b8b255b6c352123':
  Add jack-jacoco-plugin.jar to build tools

Change-Id: Id014f5f002f9cc498ee3b79ecf843112f94c7b33
2016-05-25 15:48:19 +00:00
Sebastien Hertz
882fd85a9b Add jack-jacoco-plugin.jar to build tools
Bug: 28945296

(cherry picked from commit fa52ee31da)

Change-Id: I02692a8f6495c280005130704c46f4620f1fd3e2
2016-05-25 16:20:19 +02:00
bohu
bd02f713c2 emulator: bump revision of sdk system images to 4
am: fbaf0884db

* commit 'fbaf0884db55e515c918657bc45d4f0c127b7ac5':
  emulator: bump revision of sdk system images to 4

Change-Id: I75fc621187a861533afc00f243433123776f3db5
2016-05-25 00:26:57 +00:00
bohu
fbaf0884db emulator: bump revision of sdk system images to 4
bug: 28939839

Change-Id: Ia45060bc1e81c1ab432bc27a25768ad4409dec55
2016-05-24 16:33:17 -07:00
Evan Birenbaum
7e6f9f32ce Merge "Fix a crash when exiting the DevTools Connectivity page." into nyc-dev
am: 738f9df0c8

* commit '738f9df0c8e42b396a4e54a886e94fc647681f27':
  Fix a crash when exiting the DevTools Connectivity page.

Change-Id: I0a31fa64d2d5d1a6a21bcb1fad81518d03d61517
2016-05-24 20:52:00 +00:00
Chris Iremonger
738f9df0c8 Merge "Fix a crash when exiting the DevTools Connectivity page." into nyc-dev 2016-05-24 20:40:11 +00:00
Evan Birenbaum
2817836d75 Fix a crash when exiting the DevTools Connectivity page.
A lock was being released without checking if it was held, which
resulted in a crash because WifiManager.MulticastLock is reference
counted by default.

BUG=28668604

Change-Id: I306731129894d5525e974561c2680ae7db5aff4b
2016-05-24 03:36:25 +00:00
Xavier Ducrohet
95c74ecf9a Merge "Move SDK platfrom component to rev 4" into nyc-dev
am: 99433f6878

* commit '99433f687836b98aaf411478c728bd8c4a2c8e32':
  Move SDK platfrom component to rev 4

Change-Id: If285ed18ddfd11d93bedc988541110d8a65a8a9b
2016-05-24 00:38:15 +00:00
Xavier Ducrohet
99433f6878 Merge "Move SDK platfrom component to rev 4" into nyc-dev 2016-05-24 00:22:53 +00:00
Xavier Ducrohet
66ffdc5759 Move SDK platfrom component to rev 4
Bug: 28913561

Change-Id: I272147e029aa771c3deea55d7702a4c039168eb8
2016-05-24 00:22:26 +00:00
Miao Wang
ba0533ca66 Merge "Add x86_64 linker to Build-Tools for RenderScript." into nyc-dev
am: afdc158c77

* commit 'afdc158c772bf7d45b1e405a7fad39d6c3518d95':
  [RenderScript] Move BLAS libs to a separate blas/ dir.

Change-Id: I271168de96719dc303ea7c27514eb957d301ea44
2016-05-24 00:01:54 +00:00
Miao Wang
74c770d46a Merge "Add x86_64 linker to Build-Tools for RenderScript." into nyc-dev
am: 5f0e3ac209

* commit '5f0e3ac209b2e3600476c7515ef74a575d13d4ef':
  Add x86_64 linker to Build-Tools for RenderScript.

Change-Id: Ia8947c87c023483b7dd78cd4b5fb8dcddbcc4cb8
2016-05-24 00:01:53 +00:00
Miao Wang
3c3bc89a7c Merge "Add x86_64 RenderScript prebuilts to Build-Tools." into nyc-dev
am: 0b79118f35

* commit '0b79118f35d0cc4464cd55605c101d37825840e0':
  Add x86_64 RenderScript prebuilts to Build-Tools.

Change-Id: Ieb475fe80dbac07cd1b16286afde6251a28d4317
2016-05-24 00:01:47 +00:00
Miao Wang
afdc158c77 Merge "[RenderScript] Move BLAS libs to a separate blas/ dir." into nyc-dev 2016-05-23 23:45:11 +00:00
Miao Wang
5f0e3ac209 Merge "Add x86_64 linker to Build-Tools for RenderScript." into nyc-dev 2016-05-23 23:44:26 +00:00
Miao Wang
0b79118f35 Merge "Add x86_64 RenderScript prebuilts to Build-Tools." into nyc-dev 2016-05-23 23:44:26 +00:00
Miao Wang
f8efab30e6 [RenderScript] Move BLAS libs to a separate blas/ dir.
Bug: 28861779

  - Move support lib BLAS to renderscript/lib/blas/.
  - Make it a optional component for the APK.

Change-Id: Id5937745642a268ae73a5a23c75657b0231626c6
2016-05-23 14:22:18 -07:00
Miao Wang
7516c05b76 Add x86_64 RenderScript prebuilts to Build-Tools.
Bug: 27972043

Change-Id: Iefcb0f63e72cea0b58b21fc7b9fef8c6e7e8b70d
2016-05-23 14:14:27 -07:00
Alan Viverette
dccbe07343 Merge "Add documents-archive to list of support libraries" into nyc-dev
am: 1a44969bce

* commit '1a44969bce4e65524feb4b4ba2679f20c8b6a398':
  Add documents-archive to list of support libraries

Change-Id: Iee5d318771eb9aa3cc2a5a4bbbeedcf91fbf0db8
2016-05-19 19:48:44 +00:00
Alan Viverette
1a44969bce Merge "Add documents-archive to list of support libraries" into nyc-dev 2016-05-19 19:39:11 +00:00
Andrii Kulian
76895e8aed Merge "Improve MultiWindow sample" into nyc-dev
am: 13ab0f50b1

* commit '13ab0f50b145baf3605cfd50fd93fddc1d0b25db':
  Improve MultiWindow sample

Change-Id: Ie762ec28b81051a9549f2034f0ff39506656da17
2016-05-19 17:28:06 +00:00
Andrii Kulian
13ab0f50b1 Merge "Improve MultiWindow sample" into nyc-dev 2016-05-19 17:13:21 +00:00
Michael Wright
ddd647da37 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: e575990583

* commit 'e575990583183fc804e1ff41e91dea8c7dd5decc':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: Ib7f4001f3f78af9036e7ceba9f7e49a094b32772
2016-05-19 15:11:55 +00:00
TreeHugger Robot
e575990583 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:35 +00:00
Andrii Kulian
7d7cc03dbc Improve MultiWindow sample
Now using only one activity able to showcase supported launching options.
Added instance counter for better visibility.

Bug: 28848683
Change-Id: Ib98dad994d39aff1b617dce4371699c846d06f6f
2016-05-19 01:27:08 -07:00
Trevor Johns
84e00e6596 Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE) am: 8e7e496ae9 -s ours am: d40e8bab4b -s ours am: 61f4b66afe -s ours am: 5157deb652 -s ours
am: e1d8a63bc2  -s ours

* commit 'e1d8a63bc231ccd377d3b9c1825655d3986f56cf':
  Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE)

Change-Id: I2c4c9451b66a39603a5044b07e614efa45b7b0a8
2016-05-18 08:18:02 +00:00
Trevor Johns
e1d8a63bc2 Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE) am: 8e7e496ae9 -s ours am: d40e8bab4b -s ours am: 61f4b66afe -s ours
am: 5157deb652  -s ours

* commit '5157deb652a94a072332e4b6777d226f84db73c3':
  Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE)

Change-Id: I6a0f1501d6ae272efe7f2cc80061407c1f106bcd
2016-05-18 08:15:30 +00:00
Trevor Johns
5157deb652 Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE) am: 8e7e496ae9 -s ours am: d40e8bab4b -s ours
am: 61f4b66afe  -s ours

* commit '61f4b66afe39616b574bdf0018acfa3a2f151a06':
  Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE)

Change-Id: Ie5764f5f8534f2248a2818460c0113be9e9a0187
2016-05-18 08:12:46 +00:00
Trevor Johns
61f4b66afe Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE) am: 8e7e496ae9 -s ours
am: d40e8bab4b  -s ours

* commit 'd40e8bab4b6b2bd486005de39691c8bffff2cd94':
  Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE)

Change-Id: I9587bb9738e44e03de72f3ef0a65fd57780ade68
2016-05-18 08:10:19 +00:00
Trevor Johns
d40e8bab4b Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE)
am: 8e7e496ae9  -s ours

* commit '8e7e496ae9c4bcbad14bd543171f2b5a7d8dfeb5':
  Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE)

Change-Id: Iad1d89293f3cd3e211b49932c3477f99ec205196
2016-05-18 08:07:31 +00:00
Trevor Johns
8e7e496ae9 Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE)
developers/build: fb039d88ed8e9183cae9ce510bf9c907d23ecc50
developers/samples/android: 7c3c09dcf092593adb8c13f8e15260f4da0a799a

Change-Id: I11ffce54e0f557375c2040682923042e7af5b0ca
2016-05-18 00:47:32 -07:00
Yohei Yukawa
e475c27e49 Merge "Follow class package change: LocaleList" into nyc-dev
am: c80ac6dc90

* commit 'c80ac6dc90722a139457ff68ca687ba6acde8a2b':
  Follow class package change: LocaleList

Change-Id: I0ea61b4b5e518dba6beda8ae43dee578d8d15380
2016-05-18 02:24:48 +00:00
Yohei Yukawa
c80ac6dc90 Merge "Follow class package change: LocaleList" into nyc-dev 2016-05-18 02:14:25 +00:00
Andrii Kulian
d838d5de41 DO NOT MERGE Hide decor caption APIs
am: 43d246dfa2

* commit '43d246dfa202e01051f942995ed81c1d6128569e':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I7dd78c3f5466c2e776ae152936b0cbf86173c669
2016-05-18 01:00:06 +00:00
Andrii Kulian
43d246dfa2 DO NOT MERGE Hide decor caption APIs
Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.

Bug: 28774476
Change-Id: I7b0e32459f18edcb903a1fb9cf80196fddc24d49
2016-05-17 16:17:42 -07:00
Yohei Yukawa
2e3c5bd7cc Follow class package change: LocaleList
In order to avoid layering violation, LocaleList needs to be moved from
android.util package to android.os package [1].  This CL follows up that
package change.

No behavior change is intended.

 [1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18

Bug: 28819696
Change-Id: Ib331cc3a63f7a1e656573f032a1e69eb906f7c14
2016-05-17 15:47:19 -07:00
Michael Wright
71620c8898 DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
This is a response to API council feedback.

Bug: 26830970
Change-Id: I19d3919dc201fdf2b949074f02490669b4a5d775
2016-05-17 20:03:23 +01:00
Makoto Onuki
b6fc18aa28 Merge "ShortcutDemo: changes for DR API update." into nyc-mr1-dev 2016-05-17 18:01:30 +00:00
Alan Viverette
9c386f79f1 Add documents-archive to list of support libraries
Bug: 28762753
Change-Id: Idb4a22c9eb3de50cc95db3b01070ec291f81f84c
2016-05-13 18:21:50 +00:00
Keyvan Amiri
00f09fa40d Merge changes Ife2ffbed,I3bd8b266 into nyc-dev
am: 3a1d9d5f06

* commit '3a1d9d5f06913525e5dc157abb9bc1cdb6a81315':
  Showcase app: added a video playing at the end of GuidedStepFragment workflow
  Showcase app: Fixed video fragment not showing video. Updated Settings and deprecated APIs for the app to be installable on L.

Change-Id: I2335daa33dde0f4d21616f2aea4525563da1c302
2016-05-13 17:47:01 +00:00
Dake Gu
c428170e91 Merge "SupportLeanbackshowcase: clean up preference fragment code" into nyc-dev
am: 097514b34c

* commit '097514b34cd5e4c22df302cadef34d95159f869e':
  SupportLeanbackshowcase: clean up preference fragment code

Change-Id: Ie67a31332642a4ba9c80dd3b83e923c9d215d6c4
2016-05-13 17:47:01 +00:00
Dake Gu
3a1d9d5f06 Merge changes Ife2ffbed,I3bd8b266 into nyc-dev
* changes:
  Showcase app: added a video playing at the end of GuidedStepFragment workflow
  Showcase app: Fixed video fragment not showing video. Updated Settings and deprecated APIs for the app to be installable on L.
2016-05-13 17:42:06 +00:00
Dake Gu
097514b34c Merge "SupportLeanbackshowcase: clean up preference fragment code" into nyc-dev 2016-05-13 17:41:41 +00:00
susnata
147f009526 Merge "Added missing licensing information in source files." into nyc-dev
am: b94abc7c9c

* commit 'b94abc7c9c0e558a189e6beb85e68ddb9419bd44':
  Added missing licensing information in source files.

Change-Id: Ic0b5c2214eb3dc44979e4fcb2d70788fc0dc6764
2016-05-13 16:52:18 +00:00
Susnata Basak
b94abc7c9c Merge "Added missing licensing information in source files." into nyc-dev 2016-05-13 16:47:30 +00:00
Yuichi Araki
06b7ca35c3 Merge "Add usage of app:behavior_skipCollapsed" into nyc-dev
am: 514e08249a

* commit '514e08249aec11859633a748539235bbe42b576d':
  Add usage of app:behavior_skipCollapsed

Change-Id: Ic9bdb582065694aeefd0642b2428f21cd54a281b
2016-05-13 01:53:17 +00:00
Yuichi Araki
514e08249a Merge "Add usage of app:behavior_skipCollapsed" into nyc-dev 2016-05-13 01:48:42 +00:00
Makoto Onuki
f3f9a3b553 ShortcutDemo: changes for DR API update.
Bug 28536066

Change-Id: I1c23bd57aba42e761ed31f8c9584d61c6900aa70
2016-05-12 16:46:02 -07:00