Yohei Yukawa
176642ec2c
Merge \"Add InputConnection#insertContent().\" into nyc-mr1-dev
...
am: 03f759e87e
2016-06-14 00:38:47 +00:00
Yohei Yukawa
03f759e87e
Merge "Add InputConnection#insertContent()." into nyc-mr1-dev
2016-06-14 00:26:39 +00:00
Adrian Roos
4c9e82dba4
Merge \\"Add MessagingStyle transitions\\" into nyc-dev am: a5e2aa99c0
...
am: 0a91c8dddf
2016-06-13 22:33:38 +00:00
Adrian Roos
0a91c8dddf
Merge \"Add MessagingStyle transitions\" into nyc-dev
...
am: a5e2aa99c0
2016-06-13 22:20:05 +00:00
Adrian Roos
c8649b381d
Merge \"Add MessagingStyle transitions\" into nyc-dev
...
am: a5e2aa99c0
2016-06-13 21:55:06 +00:00
Adrian Roos
a5e2aa99c0
Merge "Add MessagingStyle transitions" into nyc-dev
2016-06-13 21:45:08 +00:00
Adrian Roos
feafa052f3
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
2016-06-13 14:31:51 -07:00
Yohei Yukawa
152944f490
Add InputConnection#insertContent().
...
Providing an official protocol for IMEs to insert an image to the
application is something that has been requested from many IME
developers to Android OS. With this CL, IMEs are able to ask
applications to insert a content including image files as follows.
1. An application that opts in to this protocol specifies a list of
supported content MIME types in EditorInfo#contentMimeTypes.
2. When an IME is actively interacting with such an application, the
IME can call InputConnection#insertContent() with a InputContentInfo
that contains content URI, metadata (ClipDescription), and an
optional link URI.
3. The application can read the stream data from the given content URI
to insert the content into somewhere in the application.
Detailed design background can be found in the JavaDoc of
InputConnection#insertContent().
Bug: 22830793
Change-Id: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
2016-06-10 19:04:34 -07:00
Andrii Kulian
5a80940852
Merge \\"Reinflate primary action mode view after detach\\" into nyc-dev am: 82f2df6108
...
am: 6e6b0ce1a6
2016-06-11 01:42:47 +00:00
Andrii Kulian
6e6b0ce1a6
Merge \"Reinflate primary action mode view after detach\" into nyc-dev
...
am: 82f2df6108
2016-06-11 01:38:37 +00:00
Andrii Kulian
a9b59e9cf2
Merge \"Reinflate primary action mode view after detach\" into nyc-dev
...
am: 82f2df6108
2016-06-11 01:38:36 +00:00
TreeHugger Robot
82f2df6108
Merge "Reinflate primary action mode view after detach" into nyc-dev
2016-06-11 01:31:15 +00:00
Michael Kwan
5c30475094
Merge \"Temp fix to split header and position count behaviour for watches.\" into nyc-mr1-dev
...
am: 5985e3f92f
2016-06-11 00:13:22 +00:00
TreeHugger Robot
5985e3f92f
Merge "Temp fix to split header and position count behaviour for watches." into nyc-mr1-dev
2016-06-11 00:06:56 +00:00
Andrii Kulian
8d6ac26504
Reinflate primary action mode view after detach
...
When app is resized in multi-window mode we preserve the window along
with the decor view. If action mode view was shown before such config
change, its view is detached, but the mPrimaryActionModeView variable
is not cleared. So when action mode view is shown again after that it
thinks that its view is still alive.
This CL adds additional check to inflate new mPrimaryActionModeView
if it is not attached to any window.
Bug: 28971666
Change-Id: Ia8c24d4322be32e8b2c8967301beb3a4d889d501
2016-06-10 16:07:43 -07:00
Adam Lesinski
e9fdfb6334
Merge \\"BatteryStats: Fix read/write parcel order\\" into nyc-dev am: e8a442ccd6
...
am: 860e09ddce
2016-06-10 22:47:46 +00:00
Adam Lesinski
643fc8341a
Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev
...
am: e8a442ccd6
2016-06-10 22:43:49 +00:00
Adam Lesinski
860e09ddce
Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev
...
am: e8a442ccd6
2016-06-10 22:43:45 +00:00
Adam Lesinski
e8a442ccd6
Merge "BatteryStats: Fix read/write parcel order" into nyc-dev
2016-06-10 22:29:15 +00:00
Adam Lesinski
67c134f849
BatteryStats: Fix read/write parcel order
...
Also moves discharge coulomb data to BATTERY_DISCHARGE_DATA checkin line.
Bug:29264326
Bug:28743761
Change-Id: I78881e166c11f40b2397e04d2cab8d5200c71eea
2016-06-10 15:24:16 -07:00
Michael Kwan
937035ef57
Temp fix to split header and position count behaviour for watches.
...
Bug: 29010414
Bug: 29244476
Change-Id: I5c8616304e7d44f423636612670d9187ad030679
2016-06-10 12:01:23 -07:00
Adam Lesinski
334d6f35b5
Merge \\"BatteryStats: Record fine grained battery discharge\\" into nyc-dev am: 094c40b2cc
...
am: ae903e100f
2016-06-10 02:24:53 +00:00
Adam Lesinski
d499d79b07
Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
...
am: 094c40b2cc
2016-06-10 02:21:54 +00:00
Adam Lesinski
ae903e100f
Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
...
am: 094c40b2cc
2016-06-10 02:21:50 +00:00
TreeHugger Robot
094c40b2cc
Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev
2016-06-10 02:12:23 +00:00
Adam Lesinski
3ee3f63eb8
BatteryStats: Record fine grained battery discharge
...
For devices that report battery discharge via a coulomb counter,
record how much of the battery was discharged while the screen
was on/off.
Bug:28743761
Change-Id: Ie2d1708864352029ff466c1fed14fc057e19b93b
2016-06-09 17:37:22 -07:00
Phil Weaver
4b82db9d9c
Merge \\"Improve accessibility window title behavior\\" into nyc-dev am: f8af34365c
...
am: d567ae1b87
2016-06-09 23:49:20 +00:00
Phil Weaver
e2b3248823
Merge \"Improve accessibility window title behavior\" into nyc-dev
...
am: f8af34365c
2016-06-09 23:42:47 +00:00
Doris Liu
7da4903bf9
Merge changes from topic \'VectorDrawable polishing cherrypicks from master\' into nyc-mr1-dev
...
am: ea06280b3e
2016-06-09 23:42:16 +00:00
Phil Weaver
d567ae1b87
Merge \"Improve accessibility window title behavior\" into nyc-dev
...
am: f8af34365c
2016-06-09 23:41:45 +00:00
Doris Liu
c9493879d7
Support Keyframe definition for AVD on RT
...
BUG: 27441613
Change-Id: Iece386f65f3704d1b7caa2b3690a8d3048ccf6e2
2016-06-09 14:40:32 -07:00
Phil Weaver
155edc693e
Improve accessibility window title behavior
...
Un-reverts ag/1057448, but uses a version of Resources#getText
that returns null rather than throw an exception when no title
is available. This is the same call made before, so this change
should be safer.
Bug: 28744278
Change-Id: I8c123f4f6d74f796ab9e8ffcf955aaf881770da1
2016-06-09 13:45:46 -07:00
Adrian Roos
8187b7056d
Merge \"Seascape Navigation Bar View\" into nyc-mr1-dev
...
am: 7d76682bb3
2016-06-09 18:32:21 +00:00
Adrian Roos
7d76682bb3
Merge "Seascape Navigation Bar View" into nyc-mr1-dev
2016-06-09 18:22:22 +00:00
Adam Lesinski
d748cc4d05
Merge \\"Consume the first sample of KernelUidCpuTimeReader\\" into nyc-dev am: e5417a3863
...
am: 4ae9097f69
2016-06-08 22:59:14 +00:00
Adam Lesinski
a78fa63f75
Merge \"Consume the first sample of KernelUidCpuTimeReader\" into nyc-dev
...
am: e5417a3863
2016-06-08 22:55:39 +00:00
Adam Lesinski
4ae9097f69
Merge \"Consume the first sample of KernelUidCpuTimeReader\" into nyc-dev
...
am: e5417a3863
2016-06-08 22:55:33 +00:00
Adam Lesinski
e7f4f0297f
Consume the first sample of KernelUidCpuTimeReader
...
If the system_server crashes, when it starts back up
it will assume that the entries in kernelUidCpuTimeReader
are all fresh and we will end up double counting cpu time
and power.
Bug:29163081
Change-Id: I73e693199c170229af57efd610950e90263ac9bc
2016-06-08 14:19:09 -07:00
Lorenzo Colitti
3feff1367b
Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
...
am: 3e2bfbd135
2016-06-08 06:39:18 +00:00
TreeHugger Robot
3e2bfbd135
Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
...
* changes:
Give WakeupMessage the ability to transport an object as well.
Don't treat the lingerExpired broadcast specially.
Add a test for mobile data always on.
Add a FakeSettingsProvider and use it in ConnectivityServiceTest.
2016-06-08 06:35:32 +00:00
Lorenzo Colitti
eab17da588
Give WakeupMessage the ability to transport an object as well.
...
Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
2016-06-08 14:11:52 +09:00
Phil Weaver
d06094dd86
Merge \\"Revert \\"Improve accessibility window title behavior\\"\\" into nyc-dev am: fc71309640
...
am: 2c8099110e
2016-06-08 02:27:41 +00:00
Phil Weaver
2c8099110e
Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
...
am: fc71309640
2016-06-08 02:24:47 +00:00
Phil Weaver
5c32d65e78
Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
...
am: fc71309640
2016-06-08 02:24:42 +00:00
Phil Weaver
fc71309640
Merge "Revert "Improve accessibility window title behavior"" into nyc-dev
2016-06-08 02:19:34 +00:00
Andreas Gampe
a2fe97ffa4
Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am: c82a2b5358
...
am: 89b7934905
2016-06-08 00:50:03 +00:00
Andreas Gampe
66c2bfcede
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
...
am: c82a2b5358
2016-06-08 00:45:35 +00:00
Andreas Gampe
89b7934905
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
...
am: c82a2b5358
2016-06-08 00:45:34 +00:00
Jim Miller
b78840f141
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: 4401e24add
...
am: 21c77ed1a8
2016-06-08 00:43:48 +00:00
TreeHugger Robot
c82a2b5358
Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev
2016-06-08 00:39:00 +00:00
