Commit Graph

270030 Commits

Author SHA1 Message Date
Diego Perez
ca9be759c8 Fix Path_Delegate reset
Path_Delegate.reset was not clearing the last point when called. This
caused some vector drawables that relied on relative position to fail to
render correctly.

Bug: http://b.android.com/91383
Bug: http://b.android.com/203797

Change-Id: Id250ecf8a5a5c66671aa8d3ddd213996f824fd56
(cherry picked from commit d6db7133af7b5aed76d83c17b60b27742608a2df)
2016-06-21 14:48:33 +00:00
Alan Viverette
4a1bd4995e Merge \"Merge \\\"Only block invalidation in DrawableContainer initialization\\\" into nyc-dev am: 7a372a13af am: e77dc4fe06\" into nyc-mr1-dev-plus-aosp
am: aadcf202fa

Change-Id: Ic73783d6d9c9806c6469355f9ba9cd547db5451d
2016-06-21 14:04:58 +00:00
Alan Viverette
aa2b45da4d Merge \\\"Only block invalidation in DrawableContainer initialization\\\" into nyc-dev am: 7a372a13af am: 9b81f5bfaf
am: fdc99784c7

Change-Id: I2d71a46405e1ff208f6b4fdcc71b82bb8073a385
2016-06-21 14:04:55 +00:00
Android Build Merger (Role)
aadcf202fa Merge "Merge \\"Only block invalidation in DrawableContainer initialization\\" into nyc-dev am: 7a372a13af am: e77dc4fe06" into nyc-mr1-dev-plus-aosp 2016-06-21 14:00:13 +00:00
Alan Viverette
b358731d46 Merge \\"Only block invalidation in DrawableContainer initialization\\" into nyc-dev am: 7a372a13af
am: e77dc4fe06

Change-Id: I4a5f3171aee17e27ce4ab53f9f422feb6eadbbbd
2016-06-21 13:59:40 +00:00
Alan Viverette
fdc99784c7 Merge \\"Only block invalidation in DrawableContainer initialization\\" into nyc-dev am: 7a372a13af
am: 9b81f5bfaf

Change-Id: I23aa33f0a65e311fcb0db3884216666c1d6bc01c
2016-06-21 13:59:29 +00:00
Alan Viverette
9b81f5bfaf Merge \"Only block invalidation in DrawableContainer initialization\" into nyc-dev
am: 7a372a13af

Change-Id: If818fb8f01f5a20217cb57d232eb1e1afd516be6
2016-06-21 13:54:03 +00:00
Alan Viverette
e77dc4fe06 Merge \"Only block invalidation in DrawableContainer initialization\" into nyc-dev
am: 7a372a13af

Change-Id: I21a7dbf975a8dca02d87b9a0f084a6af74d55834
2016-06-21 13:53:49 +00:00
Alan Viverette
7a372a13af Merge "Only block invalidation in DrawableContainer initialization" into nyc-dev 2016-06-21 13:47:21 +00:00
Kirill Grouchnikov
ede9ad62c8 Merge "Enforce the contract laid out in Javadocs" 2016-06-21 12:28:47 +00:00
sreevanis
a8499cda94 Merge \\\\\"Documented how to handle advertisements during audio playback.\\\\\" into mnc-io-docs am: 07340a654a am: 5fef4a7d44 am: 41a7bdec97 am: 03aaf8e264
am: 2b7ac67f0f

Change-Id: Ie3211f96abc3f205373f2fbef303be638eaadea3
2016-06-21 12:12:21 +00:00
sreevanis
104af9a709 Merge \\\\\"Documented how to handle advertisements during audio playback.\\\\\" into mnc-io-docs am: 07340a654a am: 5fef4a7d44 am: 41a7bdec97 am: 09bfc29d17
am: 303c07cc6d

Change-Id: Ib0c0ad530009c0abd339d0e69d29e643d08d66c6
2016-06-21 12:07:09 +00:00
Sreevani Sreejith
2b7ac67f0f Merge \\\\"Documented how to handle advertisements during audio playback.\\\\" into mnc-io-docs am: 07340a654a am: 5fef4a7d44 am: 41a7bdec97
am: 03aaf8e264

Change-Id: I765337fbf7bdb5b076c31e3b315d31c97bb197d2
2016-06-21 12:06:42 +00:00
Sreevani Sreejith
303c07cc6d Merge \\\\"Documented how to handle advertisements during audio playback.\\\\" into mnc-io-docs am: 07340a654a am: 5fef4a7d44 am: 41a7bdec97
am: 09bfc29d17

Change-Id: I56d8dd1efe3d2e721501898691fd41923131239c
2016-06-21 12:02:14 +00:00
sreevanis
03aaf8e264 Merge \\\"Documented how to handle advertisements during audio playback.\\\" into mnc-io-docs am: 07340a654a am: 5fef4a7d44
am: 41a7bdec97

Change-Id: I0787c301ab85f1ff866b1d1eb7c4845186da8f2e
2016-06-21 11:59:13 +00:00
sreevanis
09bfc29d17 Merge \\\"Documented how to handle advertisements during audio playback.\\\" into mnc-io-docs am: 07340a654a am: 5fef4a7d44
am: 41a7bdec97

Change-Id: Ic6578db4f8d59387974be01b74bd28b86abde176
2016-06-21 11:58:53 +00:00
Sreevani Sreejith
41a7bdec97 Merge \\"Documented how to handle advertisements during audio playback.\\" into mnc-io-docs am: 07340a654a
am: 5fef4a7d44

Change-Id: Ica1016e018fe5e278babd490b631414ad220f290
2016-06-21 11:55:54 +00:00
sreevanis
5fef4a7d44 Merge \"Documented how to handle advertisements during audio playback.\" into mnc-io-docs
am: 07340a654a

Change-Id: I58c4cb8ec6d86a1bb1464a4fedd14ff21ab3a863
2016-06-21 11:50:22 +00:00
Sreevani Sreejith
07340a654a Merge "Documented how to handle advertisements during audio playback." into mnc-io-docs 2016-06-21 11:44:20 +00:00
sreevanis
0c820aa9e1 Documented how to handle advertisements during audio playback.
Bug:24986554
Change-Id: I02cc0500492661ae7cde6cdae30490c00f8e4b97
2016-06-21 04:41:33 -07:00
Andrei Stingaceanu
c145902fbf Merge \\"Keyboard shortcuts: A11Y fixes cherry pick\\" into nyc-mr1-dev am: 448160e1e9
am: 0fcea07ec8

Change-Id: I070cfb98582d989dec1c2b1e24bce7bd013cbd10
2016-06-21 09:39:04 +00:00
Andrei Stingaceanu
0fcea07ec8 Merge \"Keyboard shortcuts: A11Y fixes cherry pick\" into nyc-mr1-dev
am: 448160e1e9

Change-Id: I56e0a7f8ffacc6af45bfd5326527671b6e6aee80
2016-06-21 09:36:23 +00:00
Andrei Stingaceanu
448160e1e9 Merge "Keyboard shortcuts: A11Y fixes cherry pick" into nyc-mr1-dev 2016-06-21 09:28:59 +00:00
Tony Mak
39fcc6acbc Merge "Fix the handling of bundle array in RestrictionsManager" 2016-06-21 09:14:48 +00:00
Chris Banes
ae1f719ffc Fix NPE in Toolbar - framework edition am: 3b925c1ab0
am: 09bf9e69bc

Change-Id: I17d47807646ea38d5565238d17ef6b34715a822a
2016-06-21 08:21:35 +00:00
Chris Banes
09bf9e69bc Fix NPE in Toolbar - framework edition
am: 3b925c1ab0

Change-Id: I340ddff981e938bf6f9bd3f1392eec03f25f3e5d
2016-06-21 08:16:28 +00:00
Chris Banes
3b925c1ab0 Fix NPE in Toolbar - framework edition
Caused by super constructor calling non-final methods
which Toolbar overrides, and then tries to reference
final variables.

BUG: 28806107
Change-Id: Ieaf5f7611dbbf954e49c31e604aa2f7627248615
2016-06-21 08:09:24 +00:00
Andrii Kulian
3a541adc87 Merge \"Merge \\\"Compare intent filter when launching adjacent\\\" into nyc-dev am: 9980514ee0 am: b809d1cb79\" into nyc-mr1-dev-plus-aosp
am: f7c377f0ba

Change-Id: I522e885366d4e395c5d295617902003a5c4a8d2f
2016-06-21 05:47:26 +00:00
Andrii Kulian
c3612c7289 Merge \\\"Compare intent filter when launching adjacent\\\" into nyc-dev am: 9980514ee0 am: 4f47b392cc
am: 1f52fe8ee7

Change-Id: I6805746065578f044d33929b3bd4a5d1e19a69e1
2016-06-21 05:38:34 +00:00
Android Build Merger (Role)
f7c377f0ba Merge "Merge \\"Compare intent filter when launching adjacent\\" into nyc-dev am: 9980514ee0 am: b809d1cb79" into nyc-mr1-dev-plus-aosp 2016-06-21 05:35:44 +00:00
Andrii Kulian
792d0b4f17 Merge \\"Compare intent filter when launching adjacent\\" into nyc-dev am: 9980514ee0
am: b809d1cb79

Change-Id: Ia19c62e34dc1c64be600641c31f9825b1fe0e788
2016-06-21 05:33:59 +00:00
Andrii Kulian
1f52fe8ee7 Merge \\"Compare intent filter when launching adjacent\\" into nyc-dev am: 9980514ee0
am: 4f47b392cc

Change-Id: I49d1f1e08d9b917f4ba83316d7e6a37f42b72c8f
2016-06-21 05:33:50 +00:00
Andrii Kulian
4f47b392cc Merge \"Compare intent filter when launching adjacent\" into nyc-dev
am: 9980514ee0

Change-Id: Icdd46a5b4735f04d8e82cd5ffb34bfd9066a431f
2016-06-21 05:27:27 +00:00
Andrii Kulian
b809d1cb79 Merge \"Compare intent filter when launching adjacent\" into nyc-dev
am: 9980514ee0

Change-Id: I8c2b03438fdeed6bce12489c5639245b79097577
2016-06-21 05:27:24 +00:00
Seigo Nonaka
6874ced47a Merge "Add test case for issue 29491345" 2016-06-21 05:21:50 +00:00
Andrii Kulian
9980514ee0 Merge "Compare intent filter when launching adjacent" into nyc-dev 2016-06-21 05:18:00 +00:00
Sergei Vasilinetc
afe281f7eb Merge "Fix documentation for GradientDrawable.getCornerRadius" 2016-06-21 04:10:50 +00:00
Jeremie GARCIA
b28af99421 Merge \"Merge \\\"Parse \\\"vendor/priv-app\\\" to find privileged applications\\\" into nyc-dev am: 8a1bc54ab0 am: bc7e15eedc\" into nyc-mr1-dev-plus-aosp
am: 2f20dd2e26

Change-Id: Ie1485e1becf9464baea0b7998027d97d8031d61a
2016-06-21 03:13:04 +00:00
Jeremie GARCIA
ee62e1b015 Merge \\\"Parse \\\"vendor/priv-app\\\" to find privileged applications\\\" into nyc-dev am: 8a1bc54ab0 am: 6b58130adc
am: 1a161ce520

Change-Id: I69cf9367a937e7b1f52c2e235124b5e94ade1f74
2016-06-21 03:13:01 +00:00
Android Build Merger (Role)
2f20dd2e26 Merge "Merge \\"Parse \\"vendor/priv-app\\" to find privileged applications\\" into nyc-dev am: 8a1bc54ab0 am: bc7e15eedc" into nyc-mr1-dev-plus-aosp 2016-06-21 03:08:42 +00:00
Jeremie GARCIA
5ba8d2964e Merge \\"Parse \\"vendor/priv-app\\" to find privileged applications\\" into nyc-dev am: 8a1bc54ab0
am: bc7e15eedc

Change-Id: Ifc938280d1ba107c57c84689b7a4d50f90c61020
2016-06-21 03:08:22 +00:00
Jeremie GARCIA
1a161ce520 Merge \\"Parse \\"vendor/priv-app\\" to find privileged applications\\" into nyc-dev am: 8a1bc54ab0
am: 6b58130adc

Change-Id: I2690303b23a8283fcabb92c4088b28f9d871611c
2016-06-21 03:07:50 +00:00
Jeremie GARCIA
6b58130adc Merge \"Parse \"vendor/priv-app\" to find privileged applications\" into nyc-dev
am: 8a1bc54ab0

Change-Id: I8bd79a69124345d826eff9e32b00aa8466058370
2016-06-21 03:02:46 +00:00
Jeremie GARCIA
bc7e15eedc Merge \"Parse \"vendor/priv-app\" to find privileged applications\" into nyc-dev
am: 8a1bc54ab0

Change-Id: I651efd38fa6dd6433a13e5eb7569d882866cbc1e
2016-06-21 03:02:41 +00:00
TreeHugger Robot
8a1bc54ab0 Merge "Parse "vendor/priv-app" to find privileged applications" into nyc-dev 2016-06-21 02:56:38 +00:00
Jim Miller
3dcd1fc42e Merge \\"Enable fingerprint nav by default\\" into nyc-mr1-dev am: 1ac356280c
am: c4f7a60765

Change-Id: I56bc077248e6b08ea4a1b5aa384dbb063f67c9f5
2016-06-21 02:02:46 +00:00
Jim Miller
c4f7a60765 Merge \"Enable fingerprint nav by default\" into nyc-mr1-dev
am: 1ac356280c

Change-Id: Id6df513225b539497309783c3d4f11745a147684
2016-06-21 01:58:03 +00:00
TreeHugger Robot
1ac356280c Merge "Enable fingerprint nav by default" into nyc-mr1-dev 2016-06-21 01:51:59 +00:00
sergeyv
a8d3485f3d Fix documentation for GradientDrawable.getCornerRadius
Change-Id: I4ad1ef7d989df250a9208107b5baac9e79816194
2016-06-20 18:45:25 -07:00
Seigo Nonaka
6a643348de Add test case for issue 29491345
Bug: 29491345
Change-Id: Icd7d1612ad317978356a17688d6ceb8b6a4825a8
2016-06-21 10:31:03 +09:00