OSDN Git Service
Philip P. Moltmann [Tue, 26 Jul 2016 15:11:47 +0000 (15:11 +0000)]
Set title in onCreate. am:
fef31ad5ae
am:
28c09c612f
Change-Id: I317a2ea5525518a77d286c4f472de41b2ce43bba
Justin Klaassen [Tue, 26 Jul 2016 15:11:39 +0000 (15:11 +0000)]
Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp
am:
e9720671cc
Change-Id: Ie4210de38ac851d4dfd2ba83cd8db8db890e763f
Justin Klaassen [Tue, 26 Jul 2016 15:11:34 +0000 (15:11 +0000)]
Merge \\"Fix NPE in ValueAnimator\\" into nyc-mr1-dev am:
65dfc2a3e5
am:
c98c5e0fc3
Change-Id: Ie16e4f6d04d42eed941eb24ab55d4339d38260d8
Justin Klaassen [Tue, 26 Jul 2016 15:11:27 +0000 (15:11 +0000)]
Fix NPE in ValueAnimator am:
543a7ed7af
am:
705e2fb40c
Change-Id: I5beab0d64c1544344f1153f183c513839f673a1f
Raph Levien [Tue, 26 Jul 2016 15:11:19 +0000 (15:11 +0000)]
Merge changes from topic \'am-
9fd0a895a44f4e7ebb6eebb2d79a62a9\' into nyc-mr1-dev-plus-aosp
am:
982409895c
Change-Id: I0c256aec72b97d1f90f5eb981a9ac472d0e98dac
Raph Levien [Tue, 26 Jul 2016 15:11:16 +0000 (15:11 +0000)]
Merge \\"Enforce consistent sizes for arrays in SpannableStringInternal\\" into nyc-mr1-dev am:
4e0fc3ccd2
am:
b3326e1cd4
Change-Id: Ic60e5dc71c85a31ecf4541291f2272023a48e428
Raph Levien [Tue, 26 Jul 2016 15:11:09 +0000 (15:11 +0000)]
Enforce consistent sizes for arrays in SpannableStringInternal am:
83549088c6
am:
878346cb07
Change-Id: I7a7af44dbfe328f6a34bf50609d8d50a00350ae1
Philip P. Moltmann [Tue, 26 Jul 2016 15:07:58 +0000 (15:07 +0000)]
Merge changes Idf939fd3,I6ae3f730 into nyc-mr1-dev-plus-aosp
am:
23c6d928ed
Change-Id: I9d9d93154e8c9f378261c756146a6c0774c0b40c
Philip P. Moltmann [Tue, 26 Jul 2016 15:07:55 +0000 (15:07 +0000)]
Merge \\"Handle USB power role \\'sink\\'\\" into nyc-mr1-dev am:
d021ba34fb
am:
74206f0533
Change-Id: Ic03ac0be19d1f42ee40a01b2914a90568597e841
Philip P. Moltmann [Tue, 26 Jul 2016 15:07:50 +0000 (15:07 +0000)]
Handle USB power role \\'sink\\' am:
0135516153
am:
6d0ea86fec
Change-Id: I6dd5eb7a328bd4071c4c40a2a982ec4b7de0b785
Mark Lu [Tue, 26 Jul 2016 15:07:45 +0000 (15:07 +0000)]
Merge \"Merge \\\"docs: updates to Buildilng Your First App doc\\\" into nyc-dev am:
d579d713a5 am:
0da397ea71\" into nyc-mr1-dev-plus-aosp
am:
eba36e8db9
Change-Id: I989a5d85001bbb8dfcb296628d452828670d661c
Mark Lu [Tue, 26 Jul 2016 15:07:41 +0000 (15:07 +0000)]
Merge \\\"docs: updates to Buildilng Your First App doc\\\" into nyc-dev am:
d579d713a5 am:
0da397ea71
am:
172b5d4d5c
Change-Id: Id7a171f4ad50b897c7a184b1f699413db0ee03d1
Mark Lu [Tue, 26 Jul 2016 15:07:33 +0000 (15:07 +0000)]
Merge \"docs: updates to Buildilng Your First App doc am:
08d1bff71f am:
325ce1a475\" into nyc-mr1-dev-plus-aosp
am:
3afc931fc3
Change-Id: I842697b78db33a78ec469555a0f8ec6eba66927a
Mark Lu [Tue, 26 Jul 2016 15:07:29 +0000 (15:07 +0000)]
docs: updates to Buildilng Your First App doc am:
08d1bff71f am:
325ce1a475
am:
64b340220f
Change-Id: If510d335a263491bc1cd9ad04edd46ce41bd253d
Selim Cinek [Tue, 26 Jul 2016 15:07:20 +0000 (15:07 +0000)]
Merge changes I39b8c6a5,I6a15fdea,I459d3e01 into nyc-mr1-dev-plus-aosp
am:
a2b355bba6
Change-Id: Icd0f9fafd9366eebdc901aaa98d061332208d9fa
Selim Cinek [Tue, 26 Jul 2016 15:07:16 +0000 (15:07 +0000)]
Merge changes from topic \\'home-button-lock-nyc-mr1-dev\\' into nyc-mr1-dev am:
52a11f7c64
am:
a3b7b7f8c7
Change-Id: Id2be8fe7229946165ab3551ec5e9ba8d347acac8
Selim Cinek [Tue, 26 Jul 2016 15:07:09 +0000 (15:07 +0000)]
Fixes a bug where the lockscreen would be frozen am:
3127daf036
am:
d9d592ceff
Change-Id: I258e812bc6d00fd15850fd79b27601f65a398f95
Selim Cinek [Tue, 26 Jul 2016 15:07:00 +0000 (15:07 +0000)]
Allow home button to be tapped while a incoming call shows a HUN am:
64be772e03
am:
3ee95debda
Change-Id: I6b256ffbaf2e22b2e62db627f7c2f5ca3834f501
Jason Monk [Tue, 26 Jul 2016 15:06:49 +0000 (15:06 +0000)]
Merge changes I19e53731,I12ec6445 into nyc-mr1-dev-plus-aosp
am:
b43041a8e9
Change-Id: I1e57cf7cd157790f199449bf19cb6288c70c7226
Jason Monk [Tue, 26 Jul 2016 15:06:41 +0000 (15:06 +0000)]
Merge \\"QS: Cleanup detail toggle on\\" into nyc-mr1-dev am:
5c6f5afd19
am:
8255f2c11a
Change-Id: I623b64a517eb00cb86998955346cd0a52c3c73b3
Jason Monk [Tue, 26 Jul 2016 13:22:18 +0000 (09:22 -0400)]
resolve merge conflicts of
10357a7 to master
Change-Id: I2c185ee5949ff5a67175c08b86026a060b69dc06
Derek Sollenberger [Tue, 26 Jul 2016 12:07:46 +0000 (12:07 +0000)]
Merge "Remove unused member variable from DeviceInfo."
Siyamed Sinir [Mon, 25 Jul 2016 23:12:04 +0000 (23:12 +0000)]
Merge "Update font feature settings w3 URL in api doc"
TreeHugger Robot [Mon, 25 Jul 2016 23:08:56 +0000 (23:08 +0000)]
Merge "Fix incorrect @link in ACTION_STORAGE_CHANGED comment"
Philip P. Moltmann [Mon, 25 Jul 2016 23:05:10 +0000 (23:05 +0000)]
Set title in onCreate.
am:
fef31ad5ae
Change-Id: Ide036a4f9bed9953040be7aa0f0fee26f9c84c82
Jason Monk [Mon, 25 Jul 2016 22:58:43 +0000 (22:58 +0000)]
Merge changes I2107c355,I60b5e161 into nyc-mr1-dev-plus-aosp
am:
8db381c0a0
Change-Id: Ia890077286aa752b237739573efc865136fe1b89
Jason Monk [Mon, 25 Jul 2016 22:58:40 +0000 (22:58 +0000)]
Merge \\"QS: Fixup footer + animations\\" into nyc-mr1-dev am:
425023fcda
am:
56c50d82f2
Change-Id: I780917a8244222663fad3da28254c595b411a564
Jason Monk [Mon, 25 Jul 2016 22:58:35 +0000 (22:58 +0000)]
QS: Fixup footer + animations am:
df36aed859
am:
7ce7d46728
Change-Id: Ib339b4174bd0da993a31f5be2ed6a8f852e3b318
Jorim Jaggi [Mon, 25 Jul 2016 22:58:28 +0000 (22:58 +0000)]
Merge changes I5a1e9d04,Ic6f20e06 into nyc-mr1-dev-plus-aosp
am:
1549c28f8d
Change-Id: I56bdf032da222f773c6255de2166db884ed724ce
Jorim Jaggi [Mon, 25 Jul 2016 22:58:24 +0000 (22:58 +0000)]
Merge \\"Don\\'t reset layout params when repositioning\\" into nyc-mr1-dev am:
961492cc30
am:
358ea1cc0f
Change-Id: I9bc495f56bf4bcfff81caba67ce109688f57db74
Jorim Jaggi [Mon, 25 Jul 2016 22:58:17 +0000 (22:58 +0000)]
Don\\'t reset layout params when repositioning am:
90dfb89916
am:
92a1a380c3
Change-Id: I11d00e9ed4550886d7711a406436909530d24286
Dirk Dougherty [Mon, 25 Jul 2016 22:58:10 +0000 (22:58 +0000)]
Merge \"Merge \\\"Fix code tags that contain html encoded characters, and fix at links.\\\" into nyc-dev am:
fc0bc7bf96 am:
dd756c26e2\" into nyc-mr1-dev-plus-aosp
am:
b27502cfa8
Change-Id: I14d2f94009742a853c866608ae36916996a7975b
Elliot Waite [Mon, 25 Jul 2016 22:58:03 +0000 (22:58 +0000)]
Merge \\\"Fix code tags that contain html encoded characters, and fix at links.\\\" into nyc-dev am:
fc0bc7bf96 am:
dd756c26e2
am:
c6b2cce52b
Change-Id: I8630c5a63550fcf1313ec78d5aef60c6a73d648c
Android Build Merger (Role) [Mon, 25 Jul 2016 22:52:07 +0000 (22:52 +0000)]
Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev am:
65dfc2a3e5
Fix NPE in ValueAnimator am:
543a7ed7af
Mark Lu [Mon, 25 Jul 2016 22:51:58 +0000 (22:51 +0000)]
Merge \\\"docs: updates to Buildilng Your First App doc\\\" into nyc-dev am:
d579d713a5 am:
041ac3d576
am:
9a5cbaf9d5
Change-Id: I67d9aa1303cdfb416bd5bb364b63a5ae088f8b92
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:53 +0000 (22:51 +0000)]
Merge changes from topic 'am-
9fd0a895a44f4e7ebb6eebb2d79a62a9' into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev am:
4e0fc3ccd2
Enforce consistent sizes for arrays in SpannableStringInternal am:
83549088c6
Mark Lu [Mon, 25 Jul 2016 22:51:51 +0000 (22:51 +0000)]
docs: updates to Buildilng Your First App doc am:
08d1bff71f am:
04fb0c328d
am:
e8d386e0f9
Change-Id: Ia18591f7d7b904f341948fe3d834ac69db2bac02
Elliot Waite [Mon, 25 Jul 2016 22:51:43 +0000 (22:51 +0000)]
Merge \\\"Fix code tags that contain html encoded characters, and fix at links.\\\" into nyc-dev am:
fc0bc7bf96 am:
b653777ae3
am:
5c5663e7ab
Change-Id: Iae69ca63ce98af1dc3811eb4bac8060272e05f91
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:38 +0000 (22:51 +0000)]
Merge changes Idf939fd3,I6ae3f730 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Handle USB power role \'sink\'\" into nyc-mr1-dev am:
d021ba34fb
Handle USB power role \'sink\' am:
0135516153
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:21 +0000 (22:51 +0000)]
Merge "Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am:
d579d713a5 am:
0da397ea71" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:03 +0000 (22:51 +0000)]
Merge "docs: updates to Buildilng Your First App doc am:
08d1bff71f am:
325ce1a475" into nyc-mr1-dev-plus-aosp
Justin Klaassen [Mon, 25 Jul 2016 22:50:11 +0000 (22:50 +0000)]
Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev
am:
65dfc2a3e5
Change-Id: I1acc3a4f5e540900f6e798e924ff26d5ab954d89
Justin Klaassen [Mon, 25 Jul 2016 22:50:07 +0000 (22:50 +0000)]
Fix NPE in ValueAnimator
am:
543a7ed7af
Change-Id: Ib049d75f8c8460c3e7498080bbe502e67078e6ac
Raph Levien [Mon, 25 Jul 2016 22:49:47 +0000 (22:49 +0000)]
Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev
am:
4e0fc3ccd2
Change-Id: I1d9951d56d0ba4893e4b09fb984cde3328ec390a
Raph Levien [Mon, 25 Jul 2016 22:49:14 +0000 (22:49 +0000)]
Enforce consistent sizes for arrays in SpannableStringInternal
am:
83549088c6
Change-Id: I6fd3b65dd388abcce6f8b7062f396a6fcf8fdf7a
Philip P. Moltmann [Mon, 25 Jul 2016 22:49:02 +0000 (22:49 +0000)]
Merge \"Handle USB power role \'sink\'\" into nyc-mr1-dev
am:
d021ba34fb
Change-Id: Idf939fd3875a4b232ebde6cd43a6d03e13f85a36
Philip P. Moltmann [Mon, 25 Jul 2016 22:48:54 +0000 (22:48 +0000)]
Handle USB power role \'sink\'
am:
0135516153
Change-Id: I6ae3f73072d811fc4319ff8c498962fc1802fb6f
Mark Lu [Mon, 25 Jul 2016 22:48:49 +0000 (22:48 +0000)]
Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am:
d579d713a5
am:
0da397ea71
Change-Id: Ifafd54ba11ada726905b9e0fc3a936d59ffd968d
Mark Lu [Mon, 25 Jul 2016 22:48:45 +0000 (22:48 +0000)]
docs: updates to Buildilng Your First App doc am:
08d1bff71f
am:
325ce1a475
Change-Id: Ia206bc01acd7eb17ed3ce2074c84f479351b970f
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:47 +0000 (22:47 +0000)]
Merge changes I39b8c6a5,I6a15fdea,I459d3e01 into nyc-mr1-dev-plus-aosp
* changes:
Merge changes from topic \'home-button-lock-nyc-mr1-dev\' into nyc-mr1-dev am:
52a11f7c64
Fixes a bug where the lockscreen would be frozen am:
3127daf036
Allow home button to be tapped while a incoming call shows a HUN am:
64be772e03
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:30 +0000 (22:47 +0000)]
Merge changes I19e53731,I12ec6445 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"QS: Cleanup detail toggle on\" into nyc-mr1-dev am:
5c6f5afd19
QS: Cleanup detail toggle on am:
35a9c14cc6
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:17 +0000 (22:47 +0000)]
Merge changes I2107c355,I60b5e161 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"QS: Fixup footer + animations\" into nyc-mr1-dev am:
425023fcda
QS: Fixup footer + animations am:
df36aed859
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:03 +0000 (22:47 +0000)]
Merge changes I5a1e9d04,Ic6f20e06 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Don\'t reset layout params when repositioning\" into nyc-mr1-dev am:
961492cc30
Don\'t reset layout params when repositioning am:
90dfb89916
Android Build Merger (Role) [Mon, 25 Jul 2016 22:46:46 +0000 (22:46 +0000)]
Merge "Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am:
fc0bc7bf96 am:
dd756c26e2" into nyc-mr1-dev-plus-aosp
Selim Cinek [Mon, 25 Jul 2016 22:45:40 +0000 (22:45 +0000)]
Merge changes from topic \'home-button-lock-nyc-mr1-dev\' into nyc-mr1-dev
am:
52a11f7c64
Change-Id: I39b8c6a55804b088705889888d006695ef54231d
Selim Cinek [Mon, 25 Jul 2016 22:45:36 +0000 (22:45 +0000)]
Fixes a bug where the lockscreen would be frozen
am:
3127daf036
Change-Id: I6a15fdea3a17a9f6991931edfcd6aa7b224ff159
Selim Cinek [Mon, 25 Jul 2016 22:45:30 +0000 (22:45 +0000)]
Allow home button to be tapped while a incoming call shows a HUN
am:
64be772e03
Change-Id: I459d3e0160f0b4acdd64e31dc31948685a98cf2a
Jason Monk [Mon, 25 Jul 2016 22:45:24 +0000 (22:45 +0000)]
Merge \"QS: Cleanup detail toggle on\" into nyc-mr1-dev
am:
5c6f5afd19
Change-Id: I19e5373128c30c46838ba80d3a4d49581f7793ee
Jason Monk [Mon, 25 Jul 2016 22:45:21 +0000 (22:45 +0000)]
QS: Cleanup detail toggle on
am:
35a9c14cc6
Change-Id: I12ec6445c3536235d900f23af57bedf9efcdec28
Jason Monk [Mon, 25 Jul 2016 22:45:15 +0000 (22:45 +0000)]
Merge \"QS: Fixup footer + animations\" into nyc-mr1-dev
am:
425023fcda
Change-Id: I2107c3557322dea92559e469218fae0a7fb174b4
Jason Monk [Mon, 25 Jul 2016 22:45:11 +0000 (22:45 +0000)]
QS: Fixup footer + animations
am:
df36aed859
Change-Id: I60b5e161595199b8d7dd9ae9f6932f3d9075b9fb
Jorim Jaggi [Mon, 25 Jul 2016 22:45:06 +0000 (22:45 +0000)]
Merge \"Don\'t reset layout params when repositioning\" into nyc-mr1-dev
am:
961492cc30
Change-Id: I5a1e9d04eaaacd63ffa5e6d9d7874c636b45addc
Jorim Jaggi [Mon, 25 Jul 2016 22:45:02 +0000 (22:45 +0000)]
Don\'t reset layout params when repositioning
am:
90dfb89916
Change-Id: Ic6f20e06700728935bb0bfc3bc983b068d05079b
Dirk Dougherty [Mon, 25 Jul 2016 22:44:57 +0000 (22:44 +0000)]
Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am:
fc0bc7bf96
am:
dd756c26e2
Change-Id: I52d47ffe259c163031a931f566f0eaa9fa0657e2
Mark Lu [Mon, 25 Jul 2016 22:43:41 +0000 (22:43 +0000)]
Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am:
d579d713a5
am:
041ac3d576
Change-Id: I27935655a4b00ef82dd6eb59ffe25bcc4f41220c
Mark Lu [Mon, 25 Jul 2016 22:43:36 +0000 (22:43 +0000)]
docs: updates to Buildilng Your First App doc am:
08d1bff71f
am:
04fb0c328d
Change-Id: Iaa8c32faaef6e0ebd34d81d2be7797ffa49a1f6a
Dirk Dougherty [Mon, 25 Jul 2016 22:43:33 +0000 (22:43 +0000)]
resolve merge conflicts of
c4ae782 to nyc-dev-plus-aosp am:
66641f8ec5
am:
b8500c9d6b
Change-Id: Ief74ea77b0b5149a7efb490e1d46830d62bfb2ec
Dirk Dougherty [Mon, 25 Jul 2016 22:43:30 +0000 (22:43 +0000)]
Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am:
fc0bc7bf96
am:
b653777ae3
Change-Id: I0bee12de83f9262afc89459c33d0f450d02e8065
Elliot Waite [Mon, 25 Jul 2016 22:39:11 +0000 (22:39 +0000)]
resolve merge conflicts of
c88afb6 to nyc-mr1-dev-plus-aosp
am:
8d79dc9350
Change-Id: I5459db74a0ca5b9a2e57f4d846c482a2c84f6d73
Elliot Waite [Mon, 25 Jul 2016 22:39:04 +0000 (22:39 +0000)]
resolve merge conflicts of
c4ae782 to nyc-dev-plus-aosp
am:
66641f8ec5
Change-Id: Ie46a3e22905ba61eedb1c5b26a838d77c680d829
Mark Lu [Mon, 25 Jul 2016 22:38:18 +0000 (22:38 +0000)]
Merge \"docs: updates to Buildilng Your First App doc\" into nyc-dev
am:
d579d713a5
Change-Id: Id58dd0692053ddbf41a93d6f2e45d78c4ef50df5
Mark Lu [Mon, 25 Jul 2016 22:38:08 +0000 (22:38 +0000)]
docs: updates to Buildilng Your First App doc
am:
08d1bff71f
Change-Id: I66aa204bf8618ab5af8613fac350d511b3f0486b
Elliot Waite [Mon, 25 Jul 2016 22:37:56 +0000 (22:37 +0000)]
Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev
am:
fc0bc7bf96
Change-Id: Ib71dafd15bb5b6fb16cb44fd0fa659b2f100118e
TreeHugger Robot [Mon, 25 Jul 2016 22:29:22 +0000 (22:29 +0000)]
Merge "Re-enable disabled emoji tests"
Hiroshi Yamauchi [Mon, 25 Jul 2016 22:21:35 +0000 (22:21 +0000)]
Merge "[WIP] Use non-fast JNI for Canvas.native_drawBitmap."
Chad Brubaker [Mon, 25 Jul 2016 21:54:39 +0000 (14:54 -0700)]
Fix incorrect @link in ACTION_STORAGE_CHANGED comment
Change-Id: Ibfca8651a55e32e9caed96b04e5a40dc6ebc3019
Siyamed Sinir [Mon, 25 Jul 2016 21:50:19 +0000 (14:50 -0700)]
Update font feature settings w3 URL in api doc
Bug:
29545624
Change-Id: I4611f53055f3a52bc607ac0cc8311f8a633217bf
Stan Iliev [Mon, 25 Jul 2016 21:22:49 +0000 (21:22 +0000)]
Merge "Fix bound rectangle calculation in SkiaCanvasProxy::onDrawPosText"
Roozbeh Pournader [Mon, 25 Jul 2016 21:04:34 +0000 (14:04 -0700)]
Re-enable disabled emoji tests
Since Ib68f803c6adfb41db70f7319b7736d17cdbb6ec2 updates the emoji
data to version 4.0 beta, we can now re-enable the disabled emoji
tests.
Also fix some style issues, update data file parsing method to handle
the new emoji format, add UN to unsupported flags, and do a little
refactoring.
Bug:
26187231
Change-Id: I441fdfed68381d08e5e0b3af91e94bfae742eef6
TreeHugger Robot [Mon, 25 Jul 2016 21:01:46 +0000 (21:01 +0000)]
Merge "Fix NPE in ValueAnimator" into nyc-mr1-dev
Tenghui Zhu [Mon, 25 Jul 2016 21:01:21 +0000 (21:01 +0000)]
Merge "Remove redundant code for getMappedPointer in PixelBuffer"
Dirk Dougherty [Mon, 25 Jul 2016 20:10:42 +0000 (13:10 -0700)]
resolve merge conflicts of
c88afb6 to nyc-mr1-dev-plus-aosp
Change-Id: I4f9e194d2e07852799cafabae7289a61cae18bb3
Raph Levien [Mon, 25 Jul 2016 20:52:39 +0000 (20:52 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-mr1-dev
Hiroshi Yamauchi [Mon, 25 Jul 2016 20:50:00 +0000 (13:50 -0700)]
[WIP] Use non-fast JNI for Canvas.native_drawBitmap.
To avoid long GC thread suspension in the testWidgetsContainerFling
jank test.
Bug:
30190862
Change-Id: Ib322f4c02b6a2e8906693d04a562be559729e023
Dirk Dougherty [Mon, 25 Jul 2016 20:47:53 +0000 (13:47 -0700)]
resolve merge conflicts of
c4ae782 to nyc-dev-plus-aosp
Change-Id: Ib81e71e0b9a17a4231d93f02f41c7722fad84ec3
Yuqian Li [Mon, 25 Jul 2016 20:27:01 +0000 (20:27 +0000)]
Merge "More efficient text rendering on path"
TreeHugger Robot [Mon, 25 Jul 2016 20:23:13 +0000 (20:23 +0000)]
Merge "Handle USB power role 'sink'" into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 20:17:02 +0000 (20:17 +0000)]
Merge "Potential fix for flaky tests."
Philip P. Moltmann [Mon, 25 Jul 2016 20:07:56 +0000 (13:07 -0700)]
Set title in onCreate.
This makes sure the accessibility service recognizes the correcy title.
Fixes:
30220082
Change-Id: Ieaa37818a55c7b2e543bbe8bd8836996ef0529d2
Justin Klaassen [Sat, 23 Jul 2016 02:30:03 +0000 (19:30 -0700)]
Fix NPE in ValueAnimator
- Reset mAnimationEndRequested to false in ValueAnimator#start(boolean)
so that previously canceled animated (with a start delay) can be
canceled again.
- In ObjectAnimator#animateValue(float) check if target == null
regardless of mTarget == null since it's possible the target was
explicitly set to null prior to the animator being cancelled.
Bug:
30190459
Change-Id: I6da55737df30a28f48355fc7a41ab91d05979deb
TreeHugger Robot [Mon, 25 Jul 2016 19:26:21 +0000 (19:26 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal"
TreeHugger Robot [Mon, 25 Jul 2016 19:23:54 +0000 (19:23 +0000)]
Merge "Evict thumbnail caches and delay dismissing spinner on refresh finish."
Stan Iliev [Mon, 25 Jul 2016 17:32:25 +0000 (13:32 -0400)]
Fix bound rectangle calculation in SkiaCanvasProxy::onDrawPosText
SkiaCanvasProxy::onDrawPosText was calculating wrong bound rectangle,
because the initial rectangle used to accumulate the result was not
initialized.
bug:
30357689
Change-Id: I2c2afd4645237c50a3fcf2bbd99ae1ce2cd911c1
Mark Lu [Mon, 25 Jul 2016 18:59:59 +0000 (18:59 +0000)]
Merge \"docs: updates to Buildilng Your First App doc\" into nyc-dev
am:
d579d713a5
Change-Id: Iaea16a4bd5271a9ef50e0e27556f491a0ac0d314
Mark Lu [Mon, 25 Jul 2016 18:59:56 +0000 (18:59 +0000)]
docs: updates to Buildilng Your First App doc
am:
08d1bff71f
Change-Id: I030bd03c3f83ecc8332165dea75785cc78c3a114
Selim Cinek [Mon, 25 Jul 2016 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic 'home-button-lock-nyc-mr1-dev' into nyc-mr1-dev
* changes:
Fixes a bug where the lockscreen would be frozen
Allow home button to be tapped while a incoming call shows a HUN
TreeHugger Robot [Mon, 25 Jul 2016 18:45:50 +0000 (18:45 +0000)]
Merge "docs: updates to Buildilng Your First App doc" into nyc-dev
Svetoslav Ganov [Mon, 25 Jul 2016 18:43:38 +0000 (18:43 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
Jason Monk [Mon, 25 Jul 2016 18:38:37 +0000 (18:38 +0000)]
Merge "QS: Cleanup detail toggle on" into nyc-mr1-dev
Jason Monk [Mon, 25 Jul 2016 18:36:00 +0000 (18:36 +0000)]
Merge "QS: Fixup footer + animations" into nyc-mr1-dev
OSDN Git Service
