Lajos Molnar
6c2e08083a
media: unhide codec levels
...
Bug: 28930361
Change-Id: Ic9c55389c75ef0b789722aa0a7bddd5f56b15049
2016-05-24 10:24:47 -07:00
Dianne Hackborn
e4d341503b
Merge "Work on issue #27995384 : Time in the top bar different..." into nyc-dev am: cdcc53d007
...
am: 45c02ee9d5
* commit '45c02ee9d5046bf9b03681c2c888e015ce8ddfa9':
Change-Id: I29f35223c04d9d1afe4c8b5511f1a04cf53821ee
2016-05-24 17:22:34 +00:00
Chong Zhang
d2b0d2e231
Merge "Fix wallpaper crop during unlock animation" into nyc-dev
...
am: d4a45e0c40
* commit 'd4a45e0c40b46e3d57617a91dbb0a9dc4412208c':
Fix wallpaper crop during unlock animation
Change-Id: I862e208435365cd8c0639beab8e4eaee5fee8b45
2016-05-24 17:21:30 +00:00
Dianne Hackborn
238aaf735f
Merge "Work on issue #27995384 : Time in the top bar different..." into nyc-dev am: cdcc53d007
...
am: 6d8d2a0330
* commit '6d8d2a0330b7519eda98fc6244c637423c74dfdc':
Work on issue #27995384 : Time in the top bar different...
Change-Id: Ia87353d83a3952c2cc90f979431a071d8b7f076a
2016-05-24 17:15:18 +00:00
Eric Laurent
b143e3de34
Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
2016-05-24 17:15:11 +00:00
Doris Liu
92f1384449
Merge "Improve the property modification effiency of VectorDrawable animators"
2016-05-24 17:13:36 +00:00
Chong Zhang
d4a45e0c40
Merge "Fix wallpaper crop during unlock animation" into nyc-dev
2016-05-24 17:09:09 +00:00
Dianne Hackborn
45c02ee9d5
Merge "Work on issue #27995384 : Time in the top bar different..." into nyc-dev
...
am: cdcc53d007
* commit 'cdcc53d007d613ccfcf3a36ce22fa6823c5fe954':
Work on issue #27995384 : Time in the top bar different...
Change-Id: If1f18d7c56bbe56353319b2f394f90121f050fc7
2016-05-24 17:09:00 +00:00
Dianne Hackborn
6d8d2a0330
Merge "Work on issue #27995384 : Time in the top bar different..." into nyc-dev
...
am: cdcc53d007
* commit 'cdcc53d007d613ccfcf3a36ce22fa6823c5fe954':
Work on issue #27995384 : Time in the top bar different...
Change-Id: Ia10ef2de16cf3ce18fa8a8ff3ddbbe05d9fe39d1
2016-05-24 17:08:38 +00:00
Dianne Hackborn
cdcc53d007
Merge "Work on issue #27995384 : Time in the top bar different..." into nyc-dev
2016-05-24 16:56:01 +00:00
Adarsh Fernando
b4c6f2b637
Docs: Changed URL references of relocated test_framework.png
...
Change-Id: I45458480fd07fc9da7ad74a6fc04b5ccebd8d463
2016-05-24 09:42:41 -07:00
Robert Greenwalt
78c8c42805
Merge "Add free short codes for Direct Carrier Billing." am: 8b5bbbbfa4 am: 72813ddd5b am: c676119e15
...
am: c91012b6bf
* commit 'c91012b6bf6ea5194ee368992560296eb91f47e0':
Add free short codes for Direct Carrier Billing.
Change-Id: I95835f4e14b2b62687118bf05aad6a453d6cbe3d
2016-05-24 16:30:41 +00:00
Lajos Molnar
d7184306bd
Merge "media: add missing levels in CodecProfileLevel and fix limits am: 2a4001ee62 am: 59f656bee1" into nyc-mr1-dev-plus-aosp
...
am: bf7fb5455f
* commit 'bf7fb5455f504f1b4544d680f88fbac3491f9698':
Change-Id: I820db319a2a4328250c01985cf55feba91d33c6b
2016-05-24 16:30:28 +00:00
Lajos Molnar
1aa007cda1
media: add missing levels in CodecProfileLevel and fix limits am: 2a4001ee62 am: 01df627536
...
am: 729a885a6b
* commit '729a885a6b631860389b95f1b6ef1ba20e8a872e':
media: add missing levels in CodecProfileLevel and fix limits
Change-Id: Ic6ace2469b50d49584d8d33c9d15a14d4852ed95
2016-05-24 16:30:16 +00:00
Wyatt Riley
f6527aebbc
Adding SBAS offset to Gps/Gnss SvStatus converter
...
Opposite sign of Glonass & BDS offsets. Noticed after screenshot search & further testing.
Bug: 28623392
Change-Id: I6a7c98f455ee7df278eed985ba57ec1c12d888e0
2016-05-24 09:25:02 -07:00
Vasco Brito
c91012b6bf
Merge "Add free short codes for Direct Carrier Billing." am: 8b5bbbbfa4 am: 72813ddd5b
...
am: c676119e15
* commit 'c676119e1563b38b6e8a00a7cf05833064897578':
Add free short codes for Direct Carrier Billing.
Change-Id: Ic91d00213bc2d8781ba4bf548f1dbeeebee46403
2016-05-24 16:24:29 +00:00
Android Build Merger (Role)
bf7fb5455f
Merge "media: add missing levels in CodecProfileLevel and fix limits am: 2a4001ee62 am: 59f656bee1" into nyc-mr1-dev-plus-aosp
2016-05-24 16:19:59 +00:00
Robert Greenwalt
c676119e15
Merge "Add free short codes for Direct Carrier Billing." am: 8b5bbbbfa4
...
am: 72813ddd5b
* commit '72813ddd5b63f91ba8b3e84b511c7683a10de885':
Add free short codes for Direct Carrier Billing.
Change-Id: I9c1d62bc3be22504e66218342ab18cf436952d88
2016-05-24 16:19:31 +00:00
Lajos Molnar
99e51169af
media: add missing levels in CodecProfileLevel and fix limits am: 2a4001ee62
...
am: 59f656bee1
* commit '59f656bee1ef63e00fab9d3c467a55d47f3ef3ca':
media: add missing levels in CodecProfileLevel and fix limits
Change-Id: Id95f58b13e0305e8242371e9e8ab48dd2d10abf3
2016-05-24 16:19:24 +00:00
Lajos Molnar
729a885a6b
media: add missing levels in CodecProfileLevel and fix limits am: 2a4001ee62
...
am: 01df627536
* commit '01df6275360203e4edcda1730b35d559343b150f':
media: add missing levels in CodecProfileLevel and fix limits
Change-Id: I54aa60ee7f67bc289d22f94d39e19489070f5588
2016-05-24 16:19:18 +00:00
Lajos Molnar
01df627536
media: add missing levels in CodecProfileLevel and fix limits
...
am: 2a4001ee62
* commit '2a4001ee62f3374d7fffed72d71f77c5a833c331':
media: add missing levels in CodecProfileLevel and fix limits
Change-Id: Ibfcfb720cd1503e4318ebcd14dc29749a535038c
2016-05-24 16:07:24 +00:00
Lajos Molnar
59f656bee1
media: add missing levels in CodecProfileLevel and fix limits
...
am: 2a4001ee62
* commit '2a4001ee62f3374d7fffed72d71f77c5a833c331':
media: add missing levels in CodecProfileLevel and fix limits
Change-Id: Iea860639751956dce3efd833e9bac36daefe3110
2016-05-24 16:07:21 +00:00
Vasco Brito
72813ddd5b
Merge "Add free short codes for Direct Carrier Billing."
...
am: 8b5bbbbfa4
* commit '8b5bbbbfa4318401dd074440250850ec14c0264c':
Add free short codes for Direct Carrier Billing.
Change-Id: I9ca55ccf48217f9aede7c8cc25c94070bc39e5df
2016-05-24 16:07:19 +00:00
Hui Shu
99a0089fc9
Merge "Make getMinimumVersionCode thread safe."
2016-05-24 16:05:07 +00:00
Robert Greenwalt
8b5bbbbfa4
Merge "Add free short codes for Direct Carrier Billing."
2016-05-24 15:57:10 +00:00
Jiaquan He
9e2c7ecf64
Add support for android.R.attr#onTopLauncher
...
This allows a launcher activity to always stay on top of all other
activities.
Bug: 28425537
Change-Id: Iad39a076b1e8c6a8304c3b218883a172c913a602
2016-05-24 15:38:40 +00:00
Lajos Molnar
2a4001ee62
media: add missing levels in CodecProfileLevel and fix limits
...
Bug: 28671284
Change-Id: Ie4a91f5639ce8f1c5ac825ec829ac82e695d18b5
2016-05-24 07:43:51 -07:00
Julia Reynolds
ab9c317dfb
Merge "Set autobundled summary color. am: 3011fd4dbd am: d31e42a52f" into nyc-mr1-dev-plus-aosp
...
am: c7b0f407cf
* commit 'c7b0f407cf81762fe8dcf13ea11b8120fe3ff332':
Change-Id: I242d649796550fcc11e8870c61ce54f6a0adf4cb
2016-05-24 14:41:20 +00:00
Julia Reynolds
d4506de6a8
Set autobundled summary color. am: 3011fd4dbd am: 40a3d53178
...
am: 8167148775
* commit '816714877581e62471850486dc22da22a0fa7a0a':
Set autobundled summary color.
Change-Id: I3c0dd6b9392f41a3c335204d5c394bad3fd952a5
2016-05-24 14:41:16 +00:00
Jason Monk
e24b51ed02
Merge "Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am: 8a1561a772 am: 9458057c9b" into nyc-mr1-dev-plus-aosp
...
am: fec0d78a49
* commit 'fec0d78a49cab1ef1589668e5c590911104b8c92':
Change-Id: I6576258805ad94d0f3b45eea7aca432a5e7a25b2
2016-05-24 14:41:12 +00:00
Jason Monk
17d9531edf
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am: 8a1561a772 am: f6d3295a7b
...
am: ce7e4f3e9b
* commit 'ce7e4f3e9b9b27156901b2f08f845d6a92aa08ea':
QS: Don't cause click noise when opening from QQS
Change-Id: I35ccb55d504e59a3b9c0e169b26044f0370b1794
2016-05-24 14:41:04 +00:00
Kenny Guy
9a12bb0280
Merge "Merge "Set accessibility string for suspended widgets." into nyc-dev am: 7b4b2fbc0a am: 7185fc8cc3" into nyc-mr1-dev-plus-aosp
...
am: 916752b5f3
* commit '916752b5f3609e9def5c8053493d2f53a019a00b':
Change-Id: I03333c333a6670ac36589e1e22ae24ec243a8103
2016-05-24 14:38:33 +00:00
Kenny Guy
acda99f46e
Merge "Set accessibility string for suspended widgets." into nyc-dev am: 7b4b2fbc0a am: d7d4203050
...
am: 91dfd02233
* commit '91dfd02233b4d5b75154f4a1ee3ce8450d06c429':
Set accessibility string for suspended widgets.
Change-Id: I6a431beb2c3e0aec06d8b168caf0909d52d3119d
2016-05-24 14:38:11 +00:00
Mahaver Chopra
f89b0298f5
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev am: dd86aa141e
...
am: 4545f9138e
* commit '4545f9138e765b127c5d9b2e9eb24b074a4850fa':
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Change-Id: Ic9d53692abb6b7cd6bdfbf6ce0b666c395d16a07
2016-05-24 14:37:59 +00:00
Sergio Giro
d458c41ba3
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" am: 393b67d65f am: 163f8a2e91 am: d767eba969
...
am: f076687f67
* commit 'f076687f67596f8866cb8b5e2f2a14ad22b22fda':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: I3bb0cc59545797d6075ee7b03698b6b926f912f9
2016-05-24 14:37:46 +00:00
Gustav Sennton
324aac5e34
Merge "Merge "Load WebView even if WebView relro creation times out." into nyc-dev am: a2fbfbce9e am: a44129dd55" into nyc-mr1-dev-plus-aosp
...
am: 880cec0d48
* commit '880cec0d48a5c6c1e051d530248c8e3b9b4ea9a7':
Change-Id: Ib38b4626e5c0f6332e959a7f890978a6cced5c4b
2016-05-24 14:37:33 +00:00
Android Build Merger (Role)
c7b0f407cf
Merge "Set autobundled summary color. am: 3011fd4dbd am: d31e42a52f" into nyc-mr1-dev-plus-aosp
2016-05-24 14:03:35 +00:00
Julia Reynolds
15de720d9f
Set autobundled summary color. am: 3011fd4dbd
...
am: d31e42a52f
* commit 'd31e42a52fb20ed207345defceb4c45c60c0ffd5':
Set autobundled summary color.
Change-Id: I60470d34535ee5c30dedbcfd2b313b984c583547
2016-05-24 14:03:07 +00:00
Julia Reynolds
8167148775
Set autobundled summary color. am: 3011fd4dbd
...
am: 40a3d53178
* commit '40a3d5317805434dacbd671d6d1ccb9207df90b7':
Set autobundled summary color.
Change-Id: Ieae2a6fb1beb9edb7caf20569358e80582123224
2016-05-24 14:03:03 +00:00
Julia Reynolds
40a3d53178
Set autobundled summary color.
...
am: 3011fd4dbd
* commit '3011fd4dbd4585917af71e109353e6e02332ef5b':
Set autobundled summary color.
Change-Id: I69c940d018ccd41769437c2e711ab07b7a7b369d
2016-05-24 13:58:22 +00:00
Julia Reynolds
d31e42a52f
Set autobundled summary color.
...
am: 3011fd4dbd
* commit '3011fd4dbd4585917af71e109353e6e02332ef5b':
Set autobundled summary color.
Change-Id: Ic903b346211ae89d0cd531eae98e1d90138c385c
2016-05-24 13:58:18 +00:00
Julia Reynolds
3011fd4dbd
Set autobundled summary color.
...
Change-Id: I8ceb0b045359dc364fcec411fcfc610f7f57d8db
Fixes: 28615262
2016-05-24 13:51:23 +00:00
Android Build Merger (Role)
fec0d78a49
Merge "Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am: 8a1561a772 am: 9458057c9b" into nyc-mr1-dev-plus-aosp
2016-05-24 13:49:51 +00:00
Jason Monk
53ab131ff0
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am: 8a1561a772
...
am: 9458057c9b
* commit '9458057c9b688e65d506ed4fabdc76a955aeddf9':
QS: Don't cause click noise when opening from QQS
Change-Id: I03360671df14a68f50b2e4c0de255cb737a2206a
2016-05-24 13:49:19 +00:00
Jason Monk
ce7e4f3e9b
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am: 8a1561a772
...
am: f6d3295a7b
* commit 'f6d3295a7b953d435b260c69a240d76854916f28':
QS: Don't cause click noise when opening from QQS
Change-Id: I4de4dfebfc96fe9e8eb916cb983301e858364299
2016-05-24 13:49:17 +00:00
Jason Monk
f6d3295a7b
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev
...
am: 8a1561a772
* commit '8a1561a772e735b41b48dfb91269b620b5125602':
QS: Don't cause click noise when opening from QQS
Change-Id: Id28b2b808be11f5ebf23b7c8fac749aed1aa0493
2016-05-24 13:43:47 +00:00
Jason Monk
9458057c9b
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev
...
am: 8a1561a772
* commit '8a1561a772e735b41b48dfb91269b620b5125602':
QS: Don't cause click noise when opening from QQS
Change-Id: I6cd5281ab021be51ad92c86edc9e39b62188c713
2016-05-24 13:43:42 +00:00
Kenny Guy
9fbed0378b
Update suspended to disabled.
...
Say disabled rather than suspended
when an app widget isn't available.
Bug: 28909714
Change-Id: I785af193e6eff85691196742137f7e5f5af2b30d
2016-05-24 14:41:13 +01:00
Jason Monk
8a1561a772
Merge "QS: Don't cause click noise when opening from QQS" into nyc-dev
2016-05-24 13:35:03 +00:00
Android Build Merger (Role)
916752b5f3
Merge "Merge "Set accessibility string for suspended widgets." into nyc-dev am: 7b4b2fbc0a am: 7185fc8cc3" into nyc-mr1-dev-plus-aosp
2016-05-24 13:27:30 +00:00