OSDN Git Service
Makoto Onuki [Mon, 13 Jun 2016 22:39:01 +0000 (22:39 +0000)]
Merge \\"Push DO/PO package names from DPMS to PM\\" into nyc-dev am:
f419bd9e03
am:
78f16950c6
Change-Id: If03c2dca9e089188183e6e05eda55c74fe9ee036
Jason Monk [Mon, 13 Jun 2016 22:38:58 +0000 (22:38 +0000)]
Merge \\"Make sure we don\\'t accidentally allow the night mode tile\\" into nyc-dev am:
126366dde5
am:
05157de8bc
Change-Id: Ie91d4e299b4c3d224462199f5c51d0f3ef35321e
Android Build Merger (Role) [Mon, 13 Jun 2016 22:34:30 +0000 (22:34 +0000)]
Merge "Merge \\"Don\\'t update task to return to type for last task over home\\" into nyc-dev am:
62b08eb5f2 am:
ad36bf7a92" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 13 Jun 2016 22:34:21 +0000 (22:34 +0000)]
Merge "Merge \\"Add MessagingStyle transitions\\" into nyc-dev am:
a5e2aa99c0 am:
0a91c8dddf" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 13 Jun 2016 22:34:12 +0000 (22:34 +0000)]
Merge "Merge \\\\"docs: Corrected method name in multi-window docs\\\\" into mnc-io-docs am:
0e68b6b5fc am:
2c0261224a am:
2cb6ca1892 am:
a95ab78fb2" into nyc-mr1-dev-plus-aosp
Andrii Kulian [Mon, 13 Jun 2016 22:33:42 +0000 (22:33 +0000)]
Merge \\"Don\\'t update task to return to type for last task over home\\" into nyc-dev am:
62b08eb5f2
am:
ad36bf7a92
Change-Id: Ieab80def8ce28338fc062b7b3e5caa71c6b39e0b
Adrian Roos [Mon, 13 Jun 2016 22:33:38 +0000 (22:33 +0000)]
Merge \\"Add MessagingStyle transitions\\" into nyc-dev am:
a5e2aa99c0
am:
0a91c8dddf
Change-Id: Ifd034837a0b82416e6f87dffb944b0761734a59a
Andrew Solovay [Mon, 13 Jun 2016 22:33:35 +0000 (22:33 +0000)]
Merge \\\\"docs: Corrected method name in multi-window docs\\\\" into mnc-io-docs am:
0e68b6b5fc am:
2c0261224a am:
2cb6ca1892
am:
a95ab78fb2
Change-Id: I2097215aef45083b4effa4377cc825fdc2f8c1cd
Android Build Merger (Role) [Mon, 13 Jun 2016 22:32:03 +0000 (22:32 +0000)]
Merge "Merge \\"Push DO/PO package names from DPMS to PM\\" into nyc-dev am:
f419bd9e03 am:
93322e6818" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 13 Jun 2016 22:31:56 +0000 (22:31 +0000)]
Merge "Merge \\"Make sure we don\\'t accidentally allow the night mode tile\\" into nyc-dev am:
126366dde5 am:
fac0a50c03" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 13 Jun 2016 22:31:45 +0000 (22:31 +0000)]
Merge "Merge \\"Ensuring we don\\'t try and dismiss task views that are already removed.\\" into nyc-dev am:
c169a9d8a1 am:
48fe925e69" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 13 Jun 2016 22:31:29 +0000 (22:31 +0000)]
Merge "Docs: Fixed one of the addListener() links am:
33a1ea297d am:
ba86350c63 am:
51487f06f9 am:
14e49b24ef" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 13 Jun 2016 22:31:11 +0000 (22:31 +0000)]
Merge "Merge \\"Fix setCurrentPlayTime for started but not yet pulsed animations\\" into nyc-dev am:
42d39300cf am:
da1cd7a43f" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 13 Jun 2016 22:31:04 +0000 (22:31 +0000)]
Merge "Merge \"Add a flag to toggle how much the storage manager should retain.\" into nyc-mr1-dev am:
7374971c28" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 13 Jun 2016 22:30:50 +0000 (22:30 +0000)]
Merge "Merge \\"Ensuring we don\\'t try and dismiss task views that are already removed.\\" into nyc-dev am:
c169a9d8a1 am:
7fa2ad474b" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 13 Jun 2016 22:30:42 +0000 (22:30 +0000)]
Merge "Docs: Fixed one of the addListener() links am:
33a1ea297d am:
ba86350c63 am:
51487f06f9 am:
5c6b53223c" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 13 Jun 2016 22:30:34 +0000 (22:30 +0000)]
Merge "Merge \\"Fix setCurrentPlayTime for started but not yet pulsed animations\\" into nyc-dev am:
42d39300cf am:
a28f0003eb" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 13 Jun 2016 22:30:23 +0000 (22:30 +0000)]
Merge "Merge \\"Check for detached view in drag-related APIs\\" into nyc-dev am:
cdc9d7bed9 am:
fead52ebf4" into nyc-mr1-dev-plus-aosp
Makoto Onuki [Mon, 13 Jun 2016 22:30:20 +0000 (22:30 +0000)]
Merge \\"Push DO/PO package names from DPMS to PM\\" into nyc-dev am:
f419bd9e03
am:
93322e6818
Change-Id: I4fd9877c9e6adcdeeb17a9a5a2e70731f6e0b596
Jason Monk [Mon, 13 Jun 2016 22:30:18 +0000 (22:30 +0000)]
Merge \\"Make sure we don\\'t accidentally allow the night mode tile\\" into nyc-dev am:
126366dde5
am:
fac0a50c03
Change-Id: If6df557f424ee00f740b55cdeef41cdd346d7038
Winson Chung [Mon, 13 Jun 2016 22:30:16 +0000 (22:30 +0000)]
Merge \\"Ensuring we don\\'t try and dismiss task views that are already removed.\\" into nyc-dev am:
c169a9d8a1
am:
48fe925e69
Change-Id: Icbcaafecde7cc222f30377b24e0f4ae7ab4cb449
Bert McMeen [Mon, 13 Jun 2016 22:30:14 +0000 (22:30 +0000)]
Docs: Fixed one of the addListener() links am:
33a1ea297d am:
ba86350c63 am:
51487f06f9
am:
14e49b24ef
Change-Id: I76cbef99c5620242a9bdf33c6b69bab66c9c3fbd
Doris Liu [Mon, 13 Jun 2016 22:30:12 +0000 (22:30 +0000)]
Merge \\"Fix setCurrentPlayTime for started but not yet pulsed animations\\" into nyc-dev am:
42d39300cf
am:
da1cd7a43f
Change-Id: Ia057745daf7f84a6a00163b086d8e361ffa02bc7
Daniel Nishi [Mon, 13 Jun 2016 22:28:18 +0000 (22:28 +0000)]
Merge \"Add a flag to toggle how much the storage manager should retain.\" into nyc-mr1-dev
am:
7374971c28
Change-Id: I17595b0268e73d9b3193eb81f6779278d2502efa
Winson Chung [Mon, 13 Jun 2016 22:27:36 +0000 (22:27 +0000)]
Merge \\"Ensuring we don\\'t try and dismiss task views that are already removed.\\" into nyc-dev am:
c169a9d8a1
am:
7fa2ad474b
Change-Id: I0f86f2cf5f99d0ba9c069562655f2d26f292026e
Bert McMeen [Mon, 13 Jun 2016 22:27:31 +0000 (22:27 +0000)]
Docs: Fixed one of the addListener() links am:
33a1ea297d am:
ba86350c63 am:
51487f06f9
am:
5c6b53223c
Change-Id: I9ef9a1ed7bb7780482a0a285bb56d16f505a4eba
Doris Liu [Mon, 13 Jun 2016 22:27:27 +0000 (22:27 +0000)]
Merge \\"Fix setCurrentPlayTime for started but not yet pulsed animations\\" into nyc-dev am:
42d39300cf
am:
a28f0003eb
Change-Id: Iba6b86b35e96547251a9eec3dd3ac41ab929965a
Yorke Lee [Mon, 13 Jun 2016 22:27:22 +0000 (22:27 +0000)]
Merge \\"Check for detached view in drag-related APIs\\" into nyc-dev am:
cdc9d7bed9
am:
fead52ebf4
Change-Id: I4177d8c71d8147bf6c0a1c67f38e97593712b19a
Yorke Lee [Mon, 13 Jun 2016 22:27:20 +0000 (22:27 +0000)]
Merge \\"Check for detached view in drag-related APIs\\" into nyc-dev am:
cdc9d7bed9
am:
71ab239765
Change-Id: Ie46aaaa63dc9fe9232f6c9fe661b88765f1dd7c8
Ruben Brunk [Mon, 13 Jun 2016 22:27:17 +0000 (22:27 +0000)]
Merge \\"Fix permissions update for VrListenerService on user changes.\\" into nyc-dev am:
d054f4f2fe
am:
5d411eb81a
Change-Id: I9e5c098a7539d53c78dbd902d6f2a93d6489c8e9
Gerry Fan [Mon, 13 Jun 2016 22:27:11 +0000 (22:27 +0000)]
Merge \\"Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo\\" into nyc-dev am:
da66010cd8
am:
9463baa95f
Change-Id: I2d541821d8becd527aad2dcd5a1bf9179b8b4c23
Jason Monk [Mon, 13 Jun 2016 22:27:08 +0000 (22:27 +0000)]
Merge \\"Fix QS edit view accessibility classes\\" into nyc-dev am:
0809964452
am:
29a13e79ff
Change-Id: Icbf50158a8539997027c3dc82fb0110ca1a25240
David Gross [Mon, 13 Jun 2016 22:26:46 +0000 (22:26 +0000)]
Merge \\"Delete simple reduction implementation.\\" into nyc-dev am:
d749245b88
am:
8e988ec8d8
Change-Id: Id59518d23a191364c9d147290946ab57caa704aa
Ruben Brunk [Mon, 13 Jun 2016 22:21:04 +0000 (22:21 +0000)]
Merge \\"Fix permissions update for VrListenerService on user changes.\\" into nyc-dev am:
d054f4f2fe
am:
3224aa7505
Change-Id: I2e189f09f28a3b64c37da44caeb96af095cc1709
Mark Renouf [Mon, 13 Jun 2016 22:21:01 +0000 (22:21 +0000)]
Merge \"Set hintTextColor and composingSpan style for EditText and extract view\" into nyc-mr1-dev
am:
a884aacb47
Change-Id: If1b3f7266b6d2b775fd5d6a5e0d5e5583a754fb1
Gerry Fan [Mon, 13 Jun 2016 22:20:57 +0000 (22:20 +0000)]
Merge \\"Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo\\" into nyc-dev am:
da66010cd8
am:
ab45c9df1f
Change-Id: Ic253177c769be57e77eeb1e5e86b7062b7c276a0
Jason Monk [Mon, 13 Jun 2016 22:20:54 +0000 (22:20 +0000)]
Merge \\"Fix QS edit view accessibility classes\\" into nyc-dev am:
0809964452
am:
a78fd8a31b
Change-Id: Ifb594d26308d054d313ec8980c0692fbdd203fbd
David Gross [Mon, 13 Jun 2016 22:20:32 +0000 (22:20 +0000)]
Merge \\"Delete simple reduction implementation.\\" into nyc-dev am:
d749245b88
am:
9a53329b0a
Change-Id: I66f67b6d55f4ce0496c6e136b82ca58a7a5fbfd6
Andrii Kulian [Mon, 13 Jun 2016 22:20:10 +0000 (22:20 +0000)]
Merge \"Don\'t update task to return to type for last task over home\" into nyc-dev
am:
62b08eb5f2
Change-Id: Ibf43a0588feb20e94cc8aaec1193e06e5b3426b4
Adrian Roos [Mon, 13 Jun 2016 22:20:05 +0000 (22:20 +0000)]
Merge \"Add MessagingStyle transitions\" into nyc-dev
am:
a5e2aa99c0
Change-Id: I96170c3811dd624969a1f93bb7a2dc65b8d5df0a
Andrew Solovay [Mon, 13 Jun 2016 22:19:57 +0000 (22:19 +0000)]
Merge \\\"docs: Corrected method name in multi-window docs\\\" into mnc-io-docs am:
0e68b6b5fc am:
2c0261224a
am:
2cb6ca1892
Change-Id: Ie01897c2a111084dd1cb6162c70abd44852f307a
Makoto Onuki [Mon, 13 Jun 2016 22:17:10 +0000 (22:17 +0000)]
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
am:
f419bd9e03
Change-Id: I27dec65477ddfa90060baeea26169ea79503f642
Jason Monk [Mon, 13 Jun 2016 22:17:07 +0000 (22:17 +0000)]
Merge \"Make sure we don\'t accidentally allow the night mode tile\" into nyc-dev
am:
126366dde5
Change-Id: Iba8b3696738f9fc0260311d49d6e98dfcedbc118
Winson [Mon, 13 Jun 2016 22:17:04 +0000 (22:17 +0000)]
Merge \"Ensuring we don\'t try and dismiss task views that are already removed.\" into nyc-dev
am:
c169a9d8a1
Change-Id: I16e8679a30285ca9c1472022348861b759e1aed7
Bert McMeen [Mon, 13 Jun 2016 22:17:00 +0000 (22:17 +0000)]
Docs: Fixed one of the addListener() links am:
33a1ea297d am:
ba86350c63
am:
51487f06f9
Change-Id: I4c0c094dda9ce0313c10c78438252e6174c48bc8
Doris Liu [Mon, 13 Jun 2016 22:16:57 +0000 (22:16 +0000)]
Merge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
am:
42d39300cf
Change-Id: Ia7bf744345494bbd13a742f33cb63acbe0ab3315
Yorke Lee [Mon, 13 Jun 2016 22:14:24 +0000 (22:14 +0000)]
Merge \"Check for detached view in drag-related APIs\" into nyc-dev
am:
cdc9d7bed9
Change-Id: I95d551726913c95d2806fe22ee93fcc24d1862c2
Svetoslav Ganov [Mon, 13 Jun 2016 22:14:09 +0000 (22:14 +0000)]
Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
am:
d054f4f2fe
Change-Id: I9bacc14760274c9684f0535d59133dfb109bf7a0
ggfan [Mon, 13 Jun 2016 22:13:57 +0000 (22:13 +0000)]
Merge \"Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo\" into nyc-dev
am:
da66010cd8
Change-Id: I918352c3b56e03e9fd5f9cf2696ce363668fbeeb
Jason Monk [Mon, 13 Jun 2016 22:13:43 +0000 (22:13 +0000)]
Merge \"Fix QS edit view accessibility classes\" into nyc-dev
am:
0809964452
Change-Id: I6d4bdd6814951584256d9994d5f88bcafac5edc5
David Gross [Mon, 13 Jun 2016 22:12:48 +0000 (22:12 +0000)]
Merge \"Delete simple reduction implementation.\" into nyc-dev
am:
d749245b88
Change-Id: I28a4e52a41678ecb10b0869566e1cb79d4287b60
Andrii Kulian [Mon, 13 Jun 2016 21:55:46 +0000 (21:55 +0000)]
Merge "Don't update task to return to type for last task over home" into nyc-dev
Adrian Roos [Mon, 13 Jun 2016 21:45:07 +0000 (21:45 +0000)]
Merge "Add MessagingStyle transitions" into nyc-dev
Adrian Roos [Thu, 2 Jun 2016 00:09:45 +0000 (17:09 -0700)]
Add MessagingStyle transitions
Fixes a particularly bad transition in the case where there
is one incoming message to a group.
Change-Id: Ieddece4a496292a69e14cdcd74d94986938d8223
Fixes:
29043489
Andrew Solovay [Mon, 13 Jun 2016 21:24:19 +0000 (21:24 +0000)]
Merge \\"docs: Corrected method name in multi-window docs\\" into mnc-io-docs am:
0e68b6b5fc
am:
2c0261224a
Change-Id: I52a482a04b5a8789d48a5347c9a5fc63010462b6
Makoto Onuki [Mon, 13 Jun 2016 21:23:18 +0000 (21:23 +0000)]
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
am:
f419bd9e03
Change-Id: Ic3071f3a712da72fd141ef37ac6aabe6dbd09355
Jason Monk [Mon, 13 Jun 2016 21:23:06 +0000 (21:23 +0000)]
Merge \"Make sure we don\'t accidentally allow the night mode tile\" into nyc-dev
am:
126366dde5
Change-Id: I0f256958b8596ab07e27c6c026dc7e37d5a4028f
Daniel Nishi [Mon, 13 Jun 2016 21:18:28 +0000 (21:18 +0000)]
Merge "Add a flag to toggle how much the storage manager should retain." into nyc-mr1-dev
Andrew Solovay [Mon, 13 Jun 2016 21:17:09 +0000 (21:17 +0000)]
Merge \"docs: Corrected method name in multi-window docs\" into mnc-io-docs
am:
0e68b6b5fc
Change-Id: I93b8a2788eadbfeac3b2d293e42d2cef0a42eae4
Makoto Onuki [Mon, 13 Jun 2016 21:16:28 +0000 (21:16 +0000)]
Merge "Push DO/PO package names from DPMS to PM" into nyc-dev
Winson [Mon, 13 Jun 2016 21:16:12 +0000 (21:16 +0000)]
Merge \"Ensuring we don\'t try and dismiss task views that are already removed.\" into nyc-dev
am:
c169a9d8a1
Change-Id: Ib55a3b8c0c369a14989b4155a81c3844f99d59bb
TreeHugger Robot [Mon, 13 Jun 2016 21:13:35 +0000 (21:13 +0000)]
Merge "Make sure we don't accidentally allow the night mode tile" into nyc-dev
TreeHugger Robot [Mon, 13 Jun 2016 21:12:46 +0000 (21:12 +0000)]
Merge "docs: Corrected method name in multi-window docs" into mnc-io-docs
Winson Chung [Mon, 13 Jun 2016 21:06:37 +0000 (21:06 +0000)]
Merge "Ensuring we don't try and dismiss task views that are already removed." into nyc-dev
Bert McMeen [Mon, 13 Jun 2016 20:40:18 +0000 (20:40 +0000)]
Docs: Fixed one of the addListener() links am:
33a1ea297d am:
ba86350c63
am:
51487f06f9
Change-Id: I6bbff5d2d8011acc93e20d5d28d1f87ce3968019
Bert McMeen [Mon, 13 Jun 2016 20:36:12 +0000 (20:36 +0000)]
Docs: Fixed one of the addListener() links am:
33a1ea297d
am:
ba86350c63
Change-Id: I505bc79896257c07dbeee8ed60496350f1d2668a
Doris Liu [Mon, 13 Jun 2016 20:31:32 +0000 (20:31 +0000)]
Merge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
am:
42d39300cf
Change-Id: I7c1f2adb31ece266b082ffb9ea85b17c083b518c
Bert McMeen [Mon, 13 Jun 2016 20:31:28 +0000 (20:31 +0000)]
Docs: Fixed one of the addListener() links
am:
33a1ea297d
Change-Id: Ia54cdf5de78ad7357cab5617753f5bf28ea89487
Doris Liu [Mon, 13 Jun 2016 20:24:44 +0000 (20:24 +0000)]
Merge "Fix setCurrentPlayTime for started but not yet pulsed animations" into nyc-dev
Yorke Lee [Mon, 13 Jun 2016 20:15:15 +0000 (20:15 +0000)]
Merge \"Check for detached view in drag-related APIs\" into nyc-dev
am:
cdc9d7bed9
Change-Id: Id1c2228d081e63e86278072654c4c611bdb10d1a
TreeHugger Robot [Mon, 13 Jun 2016 20:09:42 +0000 (20:09 +0000)]
Merge "Check for detached view in drag-related APIs" into nyc-dev
Svetoslav Ganov [Mon, 13 Jun 2016 20:03:40 +0000 (20:03 +0000)]
Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
am:
d054f4f2fe
Change-Id: Ib69afe57e65ea7564be3bd97124ac950862d71cb
Ruben Brunk [Mon, 13 Jun 2016 19:58:30 +0000 (19:58 +0000)]
Merge "Fix permissions update for VrListenerService on user changes." into nyc-dev
Jason Monk [Mon, 13 Jun 2016 19:39:11 +0000 (15:39 -0400)]
Make sure we don't accidentally allow the night mode tile
Bug:
28887927
Change-Id: I7cf9ae3f0c853d70172b2af3e75cd8d0106afde1
Mark Renouf [Mon, 13 Jun 2016 19:36:03 +0000 (19:36 +0000)]
Merge "Set hintTextColor and composingSpan style for EditText and extract view" into nyc-mr1-dev
Mark Renouf [Mon, 13 Jun 2016 15:21:32 +0000 (11:21 -0400)]
Set hintTextColor and composingSpan style for EditText and extract view
BUG: 339521
BUG: 339542
Change-Id: I4bcaf1f237cd32cdc683c4d9620c7d63134e7c6e
Winson [Mon, 13 Jun 2016 19:14:45 +0000 (12:14 -0700)]
Ensuring we don't try and dismiss task views that are already removed.
Bug:
29240786
Change-Id: I724e7c366b2fb835fd81fa966689f999953ef4c8
Bert McMeen [Fri, 10 Jun 2016 22:50:54 +0000 (15:50 -0700)]
Docs: Fixed one of the addListener() links
Bug:
28454953
Change-Id: I00002c8bba42e972331d5d80193094606243e252
Yorke Lee [Mon, 13 Jun 2016 18:31:03 +0000 (11:31 -0700)]
Check for detached view in drag-related APIs
Bug:
29253539
Change-Id: I26285404ee15bb17e87ac23c67f7c3c6aaa2d968
ggfan [Mon, 13 Jun 2016 18:31:01 +0000 (18:31 +0000)]
Merge \"Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo\" into nyc-dev
am:
da66010cd8
Change-Id: Ie29b9ca18f5ff4039aade7f07b4c59a3b25d7263
Jason Monk [Mon, 13 Jun 2016 18:30:58 +0000 (18:30 +0000)]
Merge \"Fix QS edit view accessibility classes\" into nyc-dev
am:
0809964452
Change-Id: Ia562b52fff2f6efa4355b9d6ffe8af67fd845b98
Gerry Fan [Mon, 13 Jun 2016 18:27:08 +0000 (18:27 +0000)]
Merge "Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo" into nyc-dev
TreeHugger Robot [Mon, 13 Jun 2016 18:24:46 +0000 (18:24 +0000)]
Merge "Fix QS edit view accessibility classes" into nyc-dev
ggfan [Thu, 9 Jun 2016 19:44:01 +0000 (12:44 -0700)]
Update validation-layer.jd for NDK-R12:
use packed layer binaries
punt building layers to Khronos github repo
Change-Id: Icf840de42856d2488a87174b2cd6c604ef8d8770
David Gross [Mon, 13 Jun 2016 18:06:24 +0000 (18:06 +0000)]
Merge \"Delete simple reduction implementation.\" into nyc-dev
am:
d749245b88
Change-Id: I1407a9a6c239d6e2d415c7e53581d4d3eb0db8fa
David Gross [Mon, 13 Jun 2016 17:58:30 +0000 (17:58 +0000)]
Merge "Delete simple reduction implementation." into nyc-dev
Daniel Nishi [Fri, 10 Jun 2016 20:51:36 +0000 (13:51 -0700)]
Add a flag to toggle how much the storage manager should retain.
This flag is used to set how many days of storage the automatic
storage manager will retain when clearing data.
Bug:
28965462
Change-Id: I87afafb7d3252d8c390ea43b7c45fd923f911e4e
Brad Ebinger [Mon, 13 Jun 2016 17:41:51 +0000 (17:41 +0000)]
Merge \"Add EVENT_CALL_MERGE_FAILED Connection Event\" into nyc-mr1-dev
am:
a3d4baf43b
Change-Id: I56f5854a39325671b1854ce453a416eb24b9c8a8
Brad Ebinger [Mon, 13 Jun 2016 17:39:18 +0000 (17:39 +0000)]
Merge "Add EVENT_CALL_MERGE_FAILED Connection Event" into nyc-mr1-dev
Android Build Merger (Role) [Mon, 13 Jun 2016 17:37:27 +0000 (17:37 +0000)]
Merge "Prevent trimming recent tasks belonging in different stacks. am:
29dbc3cc47 am:
4a119bc588" into nyc-mr1-dev-plus-aosp
Winson [Mon, 13 Jun 2016 17:36:55 +0000 (17:36 +0000)]
Prevent trimming recent tasks belonging in different stacks. am:
29dbc3cc47
am:
4a119bc588
Change-Id: I2944cfb8c663809e2af6467532d9d084419190c4
Winson [Mon, 13 Jun 2016 17:36:53 +0000 (17:36 +0000)]
Prevent trimming recent tasks belonging in different stacks. am:
29dbc3cc47
am:
0aa4bb9e6b
Change-Id: I7224a8316f9d2a66196128f98c056de12e3b065c
Winson [Mon, 13 Jun 2016 17:30:52 +0000 (17:30 +0000)]
Prevent trimming recent tasks belonging in different stacks.
am:
29dbc3cc47
Change-Id: Iae15714c3bbca6cdb7fc52191c47dd80c47c7b03
Winson [Mon, 13 Jun 2016 17:30:33 +0000 (17:30 +0000)]
Prevent trimming recent tasks belonging in different stacks.
am:
29dbc3cc47
Change-Id: I5f87f2c865a0c5f5dad06bda895f5dd4a780d829
Doris Liu [Fri, 10 Jun 2016 21:46:43 +0000 (14:46 -0700)]
Fix setCurrentPlayTime for started but not yet pulsed animations
Also fix the behavior for calling reverse() immediately after
start(). Such case now triggers end() right away, which is
consistent with what the animation would do in M.
Bug:
29271714
Change-Id: I045e36e039179a3c462f22bc6a3a765437de4074
Winson [Wed, 8 Jun 2016 19:49:54 +0000 (12:49 -0700)]
Prevent trimming recent tasks belonging in different stacks.
- When launching an adjacent task, we usually have the same activity
not necessarily launched with MULTIPLE_TASK, so the old recent task
is incorrectly found removed.
Bug:
29121819
Change-Id: Id3bbafe0d3c535fd1a05bb373e521345c18f43d5
Andreas Gampe [Mon, 13 Jun 2016 16:58:06 +0000 (16:58 +0000)]
Merge \"Otadexopt: Expose progress percentage\" into nyc-mr1-dev
am:
b71c36b000
Change-Id: I3489b6b85f1306f2ef056aaf28c28fc16b2e2a05
TreeHugger Robot [Mon, 13 Jun 2016 16:52:17 +0000 (16:52 +0000)]
Merge "Otadexopt: Expose progress percentage" into nyc-mr1-dev
Tao Bao [Mon, 13 Jun 2016 16:50:41 +0000 (16:50 +0000)]
Merge \"Add RecoverySystem.rebootWipeAb() system API.\" into nyc-mr1-dev
am:
9aa66d57c6
Change-Id: I54cdfff9c5d82daaac50b18a79f87b477863f643
Jason Monk [Mon, 13 Jun 2016 16:43:47 +0000 (12:43 -0400)]
Fix QS edit view accessibility classes
Change-Id: I6aecd900ac6123e3499ab65db8896d51b70e2f89
Fixes:
29126464
OSDN Git Service
