Chong Zhang
8843af290b
Merge "Fix wallpaper crop during unlock animation" into nyc-dev am: d4a45e0c40
...
am: d2b0d2e231
* commit 'd2b0d2e231dc09231e5bfe52ae42b7f16e7f03c2':
Fix wallpaper crop during unlock animation
Change-Id: I215425d36b6bf8822c91809e8ff7fbd635b5eb11
2016-05-24 17:30:46 +00:00
Diego Perez
790e5f6c1c
Workaround to display menus for AppCompat themes
...
Layoutlib currently does not implement menus for the support Toolbar.
When it detects that an AppCompat theme is being used, it will try to
use by default the support Toolbar which breaks the display of menus.
This works around the problem by forcing layoutlib
to use the framework toolbar in menu previews (regular activities
won't display the menu if they use AppCompat).
Bug: http://b.android.com/210946
Change-Id: Ic1d162c6d74119ef42895776c3bc3851a9549120
2016-05-24 18:27:35 +01:00
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
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
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
Robert Greenwalt
8b5bbbbfa4
Merge "Add free short codes for Direct Carrier Billing."
2016-05-24 15:57:10 +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
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
Kenny Guy
5a9b2ed1ea
Merge "Set accessibility string for suspended widgets." into nyc-dev am: 7b4b2fbc0a
...
am: 7185fc8cc3
* commit '7185fc8cc3266ad713a4f19791dec5b7a06e57e0':
Set accessibility string for suspended widgets.
Change-Id: Ice17a4983d11a49d260ca6082f85d03908694e5f
2016-05-24 13:27:01 +00:00
Kenny Guy
91dfd02233
Merge "Set accessibility string for suspended widgets." into nyc-dev am: 7b4b2fbc0a
...
am: d7d4203050
* commit 'd7d420305094d8e267c8fc3cee5ab2252bf1280c':
Set accessibility string for suspended widgets.
Change-Id: I26a41681436009fb1fc6fc57c102539be0096687
2016-05-24 13:26:56 +00:00
Kenny Guy
d7d4203050
Merge "Set accessibility string for suspended widgets." into nyc-dev
...
am: 7b4b2fbc0a
* commit '7b4b2fbc0afd9cff3d4bb647b0ed7dc79ab747dc':
Set accessibility string for suspended widgets.
Change-Id: Idc35229ca5da9b460c0b806b3833196d66c48499
2016-05-24 13:20:31 +00:00
Kenny Guy
7185fc8cc3
Merge "Set accessibility string for suspended widgets." into nyc-dev
...
am: 7b4b2fbc0a
* commit '7b4b2fbc0afd9cff3d4bb647b0ed7dc79ab747dc':
Set accessibility string for suspended widgets.
Change-Id: Iedafb99a35224a37e816c510284ebfc01fe3c87d
2016-05-24 13:20:25 +00:00
Kenny Guy
7b4b2fbc0a
Merge "Set accessibility string for suspended widgets." into nyc-dev
2016-05-24 13:11:12 +00:00
Mahaver Chopra
4545f9138e
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
...
am: dd86aa141e
* commit 'dd86aa141e02ffaf277996fc1701141ea13e090e':
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Change-Id: I077fd5c067c453a4dcd161ba582e473ade1a8392
2016-05-24 12:30:44 +00:00
Mahaver Chopra
dd86aa141e
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
2016-05-24 12:22:51 +00:00
Sergio Giro
f076687f67
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" am: 393b67d65f am: 163f8a2e91
...
am: d767eba969
* commit 'd767eba969531b2df1ed41d82dac0853dce67cce':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: I78cfc9155ab1ab43b4c8280f57f877b551882b9b
2016-05-24 12:18:31 +00:00
Sergio Giro
d767eba969
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" am: 393b67d65f
...
am: 163f8a2e91
* commit '163f8a2e9132b60f86f28a352ded1db6a38d367e':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: Ibb6a051e31bb52c246be990fe79495f1f7252b9f
2016-05-24 12:14:18 +00:00
Sergio Giro
163f8a2e91
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
...
am: 393b67d65f
* commit '393b67d65fdbf4565cbec2f40fcabaaf87143dfd':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: Idc8e1ca4ae2160285fe56995290c241c3a7288f2
2016-05-24 12:06:25 +00:00
Mahaver Chopra
830e32cdcc
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
...
Bug: 28339424
Change-Id: I4b6dc6f186ea60a13e778f52d574e615b0b19b74
2016-05-24 12:03:40 +00:00
Sergio Giro
393b67d65f
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
2016-05-24 11:56:50 +00:00
Android Build Merger (Role)
880cec0d48
Merge "Merge "Load WebView even if WebView relro creation times out." into nyc-dev am: a2fbfbce9e am: a44129dd55" into nyc-mr1-dev-plus-aosp
2016-05-24 10:51:38 +00:00