Commit Graph

57878 Commits

Author SHA1 Message Date
Philip P. Moltmann
18f68dd466 Merge "Add cancelation signal to OnRequestPrinterIcon." into nyc-dev am: a393be9
am: 7f5f0de

* commit '7f5f0de5c4f02c6463594c51b046a0d18d7de038':
  Add cancelation signal to OnRequestPrinterIcon.

Change-Id: I9319a8947be763f57ca607feb66cd1c74c8cebe0
2016-03-30 16:16:58 +00:00
Alan Viverette
921889629e Merge "Pull weekday names directly from ICU" into nyc-dev am: a3a3f35
am: f5d6b7f

* commit 'f5d6b7faf180e5037e4100527ed3e4c2012e83bc':
  Pull weekday names directly from ICU

Change-Id: Ic248b5b4ae03805217b32acf28f89ce6bc5e718f
2016-03-30 16:16:23 +00:00
David Brazdil
dac7ce8efb Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev am: b67b5b9
am: 72ecc75

* commit '72ecc752ce1cb3683a6671e2de25123bead2df83':
  Move OTA package update before fstrim, hide "Optimizing apps" dialog

Change-Id: Ic4d927f18f741bf81ad64882e5acc1665f13809e
2016-03-30 16:16:09 +00:00
Andrei Stingaceanu
bbb3aee63a Merge "AfW custom lock screen message - API polish" into nyc-dev am: b70ba19
am: f46e776

* commit 'f46e776b063c66a06aa1ccc263ea3b75da43e874':
  AfW custom lock screen message - API polish

Change-Id: Ic9fa7d92d7460dc710bb06338e629d74d533d184
2016-03-30 16:15:39 +00:00
Chris Banes
6216b04d59 Merge "Re-dispatch nested scrolls if not implemented" into nyc-dev am: 6b69b12
am: 75ff37e

* commit '75ff37ebed187f2a773aac6e459ca7955bf58fa8':
  Re-dispatch nested scrolls if not implemented

Change-Id: I569b2a582439d5b098d9ea6524551957f78e9b27
2016-03-30 16:15:03 +00:00
Andre Eisenbach
41ab3eea93 Always use Write Request for GATT descriptor writes am: 613f430
am: 5e4e14c

* commit '5e4e14c4f18fcc0d8ed7d7ba790aedf10b0e14e7':
  Always use Write Request for GATT descriptor writes

Change-Id: Id49e9e549abfdcc35dcd2620c6606c45ea1a2bef
2016-03-30 16:12:42 +00:00
Philip P. Moltmann
7f5f0de5c4 Merge "Add cancelation signal to OnRequestPrinterIcon." into nyc-dev
am: a393be9

* commit 'a393be93196d89a53d53097941857b539f88da96':
  Add cancelation signal to OnRequestPrinterIcon.

Change-Id: I4a46ed1c0b9ab90edaae138ecbe0c15f82403794
2016-03-30 15:30:29 +00:00
Philip P. Moltmann
a393be9319 Merge "Add cancelation signal to OnRequestPrinterIcon." into nyc-dev 2016-03-30 15:18:32 +00:00
Alan Viverette
f5d6b7faf1 Merge "Pull weekday names directly from ICU" into nyc-dev
am: a3a3f35

* commit 'a3a3f35e8d5cafcb0e872e014ec3749329202174':
  Pull weekday names directly from ICU

Change-Id: I035332c98c525f3c1aa3d672eec33b90ae48fe59
2016-03-30 13:45:44 +00:00
Alan Viverette
a3a3f35e8d Merge "Pull weekday names directly from ICU" into nyc-dev 2016-03-30 13:35:18 +00:00
David Brazdil
72ecc752ce Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev
am: b67b5b9

* commit 'b67b5b9f3c947fc6d835459f0e880eb5fcaad50b':
  Move OTA package update before fstrim, hide "Optimizing apps" dialog

Change-Id: I8dd098ffb1a28c4061135112690fd1bdfca9a1b8
2016-03-30 12:51:29 +00:00
David Brazdil
b67b5b9f3c Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev 2016-03-30 12:41:06 +00:00
David Brazdil
f5c444ffd4 Move OTA package update before fstrim, hide "Optimizing apps" dialog
This patch moves the updating of packages before performing fstrim,
which runs asynchronously anyway, and stops showing the UI dialog.

Bug: 27350503
Change-Id: I6fceda10d7696f9badb97978fb9dc7927d698a4b
2016-03-30 13:39:14 +01:00
Andrei Stingaceanu
f46e776b06 Merge "AfW custom lock screen message - API polish" into nyc-dev
am: b70ba19

* commit 'b70ba1971c29db87e405434161489e2450309050':
  AfW custom lock screen message - API polish

Change-Id: Id2ce5fced3d6b39ab2948cb6ab7ee5001fa534cf
2016-03-30 12:35:38 +00:00
Andrei Stingaceanu
b70ba1971c Merge "AfW custom lock screen message - API polish" into nyc-dev 2016-03-30 12:23:56 +00:00
Chris Banes
75ff37ebed Merge "Re-dispatch nested scrolls if not implemented" into nyc-dev
am: 6b69b12

* commit '6b69b122025631290380f4350f7bd0074bad10dd':
  Re-dispatch nested scrolls if not implemented

Change-Id: Ibb88f89e0c77b2eef7dfda72c023fc19f27d77a0
2016-03-30 08:49:00 +00:00
Chris Banes
6b69b12202 Merge "Re-dispatch nested scrolls if not implemented" into nyc-dev 2016-03-30 08:43:40 +00:00
Andre Eisenbach
5e4e14c4f1 Always use Write Request for GATT descriptor writes
am: 613f430

* commit '613f43017736580a1625cda3c5a3ed1ea7c79238':
  Always use Write Request for GATT descriptor writes

Change-Id: Ibec3a7d44146b678f31a2c898f5be376d2a5e1a1
2016-03-30 06:52:52 +00:00
Andre Eisenbach
613f430177 Always use Write Request for GATT descriptor writes
According to the Bluetooth Core specification v4.2, Vol 3, Part G,
section 4.12.3: "The Attribute Protocol WRITE REQUEST is used used
for this sub-procedure".

Change-Id: I86e4e1d3a8bfd7d78dfed8419f8abd2d7e89b2bc
2016-03-30 06:48:58 +00:00
Andre Eisenbach
4485ecd680 Fix log spam in getCharacteristicById() am: 1591d36
am: 6fbbf9f

* commit '6fbbf9f7acfaefc178769e208cfea136d63104f8':
  Fix log spam in getCharacteristicById()

Change-Id: I74a4554a83a98c8941b2073547fd7aad7b27089a
2016-03-30 03:41:13 +00:00
Andre Eisenbach
6fbbf9f7ac Fix log spam in getCharacteristicById()
am: 1591d36

* commit '1591d368d3275276b35161810d42c6a5d9e8b43f':
  Fix log spam in getCharacteristicById()

Change-Id: I7ce3de2609c7c6bca09ad6866e6d904aeb416535
2016-03-30 03:37:35 +00:00
Andre Eisenbach
1591d368d3 Fix log spam in getCharacteristicById()
Bug: 27744135
Change-Id: I43f6358484729dedd85eb52432ad9805a66ff81e
2016-03-30 03:27:20 +00:00
Pierre Imai
ec1f9ac708 Merge "Move connectivity events to frameworks/base." into nyc-dev am: bc786b7
am: 132ffdc

* commit '132ffdcfd3d54e6be106b464bf05acaffc6435d2':
  Move connectivity events to frameworks/base.

Change-Id: Ibb7b6bd844f848db96994b8c8ee9032b35ae67b0
2016-03-30 01:26:49 +00:00
Pierre Imai
132ffdcfd3 Merge "Move connectivity events to frameworks/base." into nyc-dev
am: bc786b7

* commit 'bc786b74759470e52f3f5e80c3f4b5b1c0a52636':
  Move connectivity events to frameworks/base.

Change-Id: Ie6e22bf85a4c0330826f8200fc51c90717d93a33
2016-03-30 01:23:27 +00:00
Pierre Imai
bc786b7475 Merge "Move connectivity events to frameworks/base." into nyc-dev 2016-03-30 01:16:59 +00:00
Siyamed Sinir
6d2efef5cd Merge "Revert "TextView setText/append methods set movement method"" into nyc-dev am: d225f87
am: 7709c89

* commit '7709c892bc6ac834aeef20d5fec10233e6de9359':
  Revert "TextView setText/append methods set movement method"

Change-Id: Ib6368fc2ebd75aa2cbb18d29b32712a14e378045
2016-03-30 00:29:32 +00:00
Robert Carr
05bf752d31 Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev am: ffe3098
am: d4c85e1

* commit 'd4c85e182add4c0972f1d79163acd7281efa9f49':
  Ensure we change SurfaceView size from UI thread.

Change-Id: I6385721821ee4fa7984be316c409c52fe94b80cc
2016-03-30 00:29:23 +00:00
Jeff Sharkey
0732743d4d Merge "AccessibilityNodeInfo shouldn\'t touch extras." into nyc-dev am: af64f63
am: 21b1b0d

* commit '21b1b0d937ebfec6880900655effb55a8298cbd6':
  AccessibilityNodeInfo shouldn't touch extras.

Change-Id: Icc50a8924830abc942f87fa835b1ae715c86382a
2016-03-30 00:29:18 +00:00
Makoto Onuki
8fff90ca7c Merge "ShortcutManager: proper work profile support" into nyc-dev am: d5b745a
am: 4fc3441

* commit '4fc34416fb8d389557934f3000dab7b6fbafb97c':
  ShortcutManager: proper work profile support

Change-Id: I1a708988b7e9c505370e2399572dca6caa9d5cef
2016-03-30 00:29:13 +00:00
Siyamed Sinir
7709c892bc Merge "Revert "TextView setText/append methods set movement method"" into nyc-dev
am: d225f87

* commit 'd225f87ebc55333c3d40295d1977ce8ac4a59c2d':
  Revert "TextView setText/append methods set movement method"

Change-Id: I29b1a0d197dc2df861d5e55eb91ba17410c42664
2016-03-30 00:22:08 +00:00
Robert Carr
d4c85e182a Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev
am: ffe3098

* commit 'ffe309816989457f71a39a84d22fb06fe5b6e8d5':
  Ensure we change SurfaceView size from UI thread.

Change-Id: I8e57aa126a601df935b6005b74ba7842f819c741
2016-03-30 00:22:03 +00:00
Jeff Sharkey
21b1b0d937 Merge "AccessibilityNodeInfo shouldn\'t touch extras." into nyc-dev
am: af64f63

* commit 'af64f6341bdbca93aff3d68264af48e74faa9e58':
  AccessibilityNodeInfo shouldn't touch extras.

Change-Id: I44ae8aebdbe0046a64971eb47c25b8720f7bfd36
2016-03-30 00:22:00 +00:00
Makoto Onuki
4fc34416fb Merge "ShortcutManager: proper work profile support" into nyc-dev
am: d5b745a

* commit 'd5b745a9e64734483bc43c781ad809b2a75bd1ba':
  ShortcutManager: proper work profile support

Change-Id: Ic31214205a5a93e37e5585829ae522bf4890b519
2016-03-30 00:21:57 +00:00
Siyamed Sinir
d225f87ebc Merge "Revert "TextView setText/append methods set movement method"" into nyc-dev 2016-03-29 23:59:15 +00:00
Rob Carr
ffe3098169 Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev 2016-03-29 23:50:47 +00:00
Jeff Sharkey
af64f6341b Merge "AccessibilityNodeInfo shouldn't touch extras." into nyc-dev 2016-03-29 22:47:17 +00:00
Makoto Onuki
d5b745a9e6 Merge "ShortcutManager: proper work profile support" into nyc-dev 2016-03-29 22:45:03 +00:00
Jeff Sharkey
297017d154 AccessibilityNodeInfo shouldn't touch extras.
The extras may contain custom Parcelables which aren't in the
system's default classpath, so touching them would end up clobbering
the contents.

Update code to leave the parcelled data untouched inside the bundle
until someone tries reading the extras.

Bug: 27897919
Change-Id: I99381dd50c9a0e8887667076362ea98805f0437c
2016-03-29 16:38:55 -06:00
Adam Powell
d782a3c656 Merge "Add contentInsetStartWithNavigation/EndWithActions" into nyc-dev am: b3eca31
am: cfc0818

* commit 'cfc0818bdd778db37c74fe16d4fcaeca20ca97b0':
  Add contentInsetStartWithNavigation/EndWithActions

Change-Id: I80560fa2f5407f91b728f5dca59fcc2179576738
2016-03-29 22:22:24 +00:00
Adam Powell
cfc0818bdd Merge "Add contentInsetStartWithNavigation/EndWithActions" into nyc-dev
am: b3eca31

* commit 'b3eca3161d78f4ed5d5466de3d9ee59af6e271af':
  Add contentInsetStartWithNavigation/EndWithActions

Change-Id: Icfcd1296131ed26c97d766ccad230a59900d4b97
2016-03-29 22:19:21 +00:00
Adam Powell
b3eca3161d Merge "Add contentInsetStartWithNavigation/EndWithActions" into nyc-dev 2016-03-29 22:12:34 +00:00
Suprabh Shukla
273472810b Merge "Removing unused intent extra" into nyc-dev am: 7a3bff1
am: 13638e2

* commit '13638e29df8a031c787e809ca9c62f303a7013b6':
  Removing unused intent extra

Change-Id: Ic61e004a36124515eb7d0cb4e24b85d9d5370116
2016-03-29 22:01:49 +00:00
Suprabh Shukla
13638e29df Merge "Removing unused intent extra" into nyc-dev
am: 7a3bff1

* commit '7a3bff184731912ddcf3c88da1a6c58c956e01f2':
  Removing unused intent extra

Change-Id: I28eedcdb71c0241bcc0f2227a554d499ef7350b8
2016-03-29 21:58:08 +00:00
Suprabh Shukla
7a3bff1847 Merge "Removing unused intent extra" into nyc-dev 2016-03-29 21:48:37 +00:00
Siyamed Sinir
6ffb0a6818 Revert "TextView setText/append methods set movement method"
This reverts commit 4ba0aa598e.

Change-Id: I7d6eb2584a1348014ce9c3fc3e53b4cf96e30db1
2016-03-29 21:43:27 +00:00
Makoto Onuki
9da23fc6ac ShortcutManager: proper work profile support
Bug 27548047

Change-Id: I8acea3355f8974a551f53814624dec30732f7b2f
2016-03-29 14:42:02 -07:00
Adam Powell
679be2d6c4 Add contentInsetStartWithNavigation/EndWithActions
Allow developers to set different content insets on toolbars and
action bars to be used when navigation buttons or menu actions are
present. Set the default values for these according to the material
spec.

Bug 19317855

Change-Id: I13e04e1f19f0982bf551a3027eb70904d6b4674c
2016-03-29 14:24:15 -07:00
Alan Viverette
80f19471e1 Merge "Always use existing PopupWindow dimension if not otherwise specified" into nyc-dev am: 11c0415
am: ab985f9

* commit 'ab985f95e56cd1514974ae40dc00fef72e1672eb':
  Always use existing PopupWindow dimension if not otherwise specified

Change-Id: I8fd9b7cf8f180f4987518fde555e04469ca6955f
2016-03-29 20:46:31 +00:00
Michal Karpinski
7959416308 Merge "Moving app process logging from AMS to PMS" into nyc-dev am: 5393784
am: acc9468

* commit 'acc9468e3324046f6d7ce06de9a3d19e16849ba1':
  Moving app process logging from AMS to PMS

Change-Id: I9dcd57ee35a3102b9e13bde64f24f56991dd2620
2016-03-29 20:46:29 +00:00
Alan Viverette
ab985f95e5 Merge "Always use existing PopupWindow dimension if not otherwise specified" into nyc-dev
am: 11c0415

* commit '11c041576d3d3ea2059387ac7be89c561467b0ef':
  Always use existing PopupWindow dimension if not otherwise specified

Change-Id: Id3a4f82e97a1f2e770340fcde2c7010159230bf9
2016-03-29 20:43:33 +00:00