13250 Commits

Author SHA1 Message Date
Dongwon Kang
52e90e59f6 Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev am: 8904a1a
am: 2703a4e

* commit '2703a4e7b128b784b31c0bf7d91458c803ef7278':
  TIF: Address comments on hardware manager related system APIs

Change-Id: If7a0226ae2448b59cb28d9503e4c5271a5605f78
2016-03-31 17:55:00 +00:00
Dongwon Kang
8904a1a1df Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev 2016-03-31 17:01:36 +00:00
Yi Kong
8511a5b127 Merge "Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be" 2016-03-31 16:15:28 +00:00
Yi Kong
9272822dc0 Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be
Bug: 27762555
Change-Id: I03984f4319ba21976078b2b3dff1a857eb5ebd0a
(cherry picked from commit a7af7593fb41b7f67de8f3206233b576ebaaef48)
(cherry picked from commit c0f67813c31bd25ec40c98a4f1e77f98bdabbb48)
2016-03-31 16:04:27 +00:00
Yi Kong
c0f67813c3 Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be
Bug: 27762555
Change-Id: I03984f4319ba21976078b2b3dff1a857eb5ebd0a
(cherry picked from commit a7af7593fb41b7f67de8f3206233b576ebaaef48)
2016-03-31 16:48:01 +01:00
Paul Duffin
e30ac98a20 Remove RawCollationKey/ByteArrayWrapper from the public API am: baa7251
am: c53df04

* commit 'c53df04d5bf63ff2f3ea2de5a8d0cc8cf5bae0f3':
  Remove RawCollationKey/ByteArrayWrapper from the public API

Change-Id: Ifc5ed43e8cd6085cf4a0f89ac9cd402d7a69e33c
2016-03-31 15:40:43 +00:00
Paul Duffin
70eb311327 ICU4J: Hide constants that can change between releases am: 71498f1
am: a120a63

* commit 'a120a630a27626cd6ce34e99a80b4230fd3fdd9b':
  ICU4J: Hide constants that can change between releases

Change-Id: I79f9664692c5a459a38bf7574ddc4f9dd16479f5
2016-03-31 15:40:35 +00:00
Andrei Stingaceanu
51bc9d8e30 Merge "AfW - suspend apps - API polish" into nyc-dev am: aa60469
am: 4c0fc48

* commit '4c0fc48aa739cb7b908ac48eb7a500abe487fdbd':
  AfW - suspend apps - API polish

Change-Id: I5b244f14d7ceaec9654f10dcdf33a3ab9d7656bc
2016-03-31 15:40:28 +00:00
Paul Duffin
baa72515f6 Remove RawCollationKey/ByteArrayWrapper from the public API
Bug: 22023363
Change-Id: I03b89260a9af9a2f6d4e25799c3942ca2579e26e
2016-03-31 14:09:16 +01:00
Paul Duffin
71498f107c ICU4J: Hide constants that can change between releases
Bug: 27830659
Change-Id: Ia8274c3b9b26762de5ef3317261ef0c2a45246c3
2016-03-31 14:09:16 +01:00
Andrei Stingaceanu
aa60469445 Merge "AfW - suspend apps - API polish" into nyc-dev 2016-03-31 10:57:58 +00:00
Jeff Sharkey
562ac8b9bb Merge changes Ifecff4f1,Ia302de46 into nyc-dev am: 2c0ae91
am: 4d5806d

* commit '4d5806d0e662e0163ad174f61779a4d4ddf48b81':
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.

Change-Id: I7aa9858905cc241343da5a1fb3479bf3f74b8ba8
2016-03-31 07:00:10 +00:00
Jeff Sharkey
2c0ae91f2d Merge changes Ifecff4f1,Ia302de46 into nyc-dev
* changes:
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.
2016-03-31 06:48:55 +00:00
Jeff Sharkey
70168dde6e Make Parcelable classes final, API cleanup.
Remove some Context methods that leaked through.  Add lint rule to
recommend using List<? extends Parcelable> instead of Parcelable[].

Bug: 27932224, 27930145, 27932911
Change-Id: Ia302de46cdb0c5101fa175a09316df91aeefcf0d
2016-03-30 23:31:39 -06:00
Tomasz Mikolajewski
ac0bbdbf27 Merge "Unhide DocumentsContract.EXTRA_ORIENTATION." into nyc-dev am: 88f8675
am: 1372e9b

* commit '1372e9bd9a8cf3a75dd533a620177c5f01a0856f':
  Unhide DocumentsContract.EXTRA_ORIENTATION.

Change-Id: I244dfefa63a02f7710dbd4ec51866e8fd56a687e
2016-03-31 03:58:30 +00:00
Tomasz Mikolajewski
3720f795ce Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev am: e1d0cab
am: f2c62df

* commit 'f2c62df0365c23357bed8178e7651908a730c782':
  Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.

Change-Id: I59b4cb74bacbafc22a7e0305813a039d132f65bd
2016-03-31 03:58:25 +00:00
Tomasz Mikolajewski
88f8675471 Merge "Unhide DocumentsContract.EXTRA_ORIENTATION." into nyc-dev 2016-03-31 03:50:19 +00:00
Tomasz Mikolajewski
e1d0cabb5f Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev 2016-03-31 03:47:41 +00:00
Philip P. Moltmann
ddea724b36 Merge "Add the print service recommendation service" into nyc-dev am: 740a5f0
am: fa04bc7

* commit 'fa04bc7a5d49415bc7cd397bb9678316d3824f85':
  Add the print service recommendation service

Change-Id: I3da289dfe99e1caa3ed2ab3368902d597f16f738
2016-03-31 02:23:16 +00:00
Andrii Kulian
e61d037a87 Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev am: ac94586
am: b6ba05f

* commit 'b6ba05ffb07f5785c24de21152405ee0bd92bf3c':
  Refactor usages of Picture In Picture and Multi Window (1/4)

Change-Id: I24d558529fa14f780c714d26a834306057cf7b2b
2016-03-31 02:22:57 +00:00
Ruchi Kandoi
cb1078ec7d Merge "Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API."" into nyc-dev am: 93cfef4
am: 29e7471

* commit '29e747140ff82b1d48890e9109d669e884eb57fe':
  Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API."

Change-Id: I4b042099a0b5f0da7a59556d81075ac55d6c8326
2016-03-31 02:22:49 +00:00
Tomasz Mikolajewski
2b57efb262 Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.
Bug: 27579803
Change-Id: If9fe16976cfbc0760a6afb3043d35e0ee387945c
2016-03-31 10:36:26 +09:00
Philip P. Moltmann
740a5f023e Merge "Add the print service recommendation service" into nyc-dev 2016-03-31 01:33:17 +00:00
Tomasz Mikolajewski
5f53f65311 Unhide DocumentsContract.EXTRA_ORIENTATION.
Bug: 27351468
Change-Id: Ib205dfe5fab995880407792cc15178aaf1ac15e6
2016-03-31 10:30:46 +09:00
Andrii Kulian
ac94586714 Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev 2016-03-31 00:57:42 +00:00
Ruchi Kandoi
93cfef460c Merge "Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API."" into nyc-dev 2016-03-31 00:54:25 +00:00
Philip P. Moltmann
9dcb86a48d Add the print service recommendation service
This service connects through the print manager to the print spooler:

PrintSpooler.AddPrintersActivity <-> PrintManager <-> PrintManagerService <-> UserState <-> RemotePrintServiceRecommendationService <-> PrintRecommendationService <-> PrintRecommendationServiceImpl

Hence there is a lot of mindless plumming.

The actual changes are only in the AddPrintersActivity which is extended
to show another list of services: The recommended services.

The PrintServiceRecommendationService is based on the experimenal print
service stubs provider. This provider was contributed the Android by
Mopria. As this services uses Android own network discovery service most
code from the experimental provider goes away. In fact the only logic
left over is the selections of mdns-txt fields to look at and the
printer vendor configuration.

This relies on the Android MDNS to get fixed (Bug: 27696905). This also
does not deal with how to update the recommendation service.

Bug: 24533249
Change-Id: I6edc6e25fc08a50d478b61c71bb8ea158b08624c
2016-03-30 17:21:07 -07:00
Yohei Yukawa
06ac74543b Merge "Add IC#closeConnection()." into nyc-dev am: f6f0f5f
am: 9f42270

* commit '9f42270f9b16ef47f713868af0796262b2eafc57':
  Add IC#closeConnection().

Change-Id: I3fca2eb604a485b904099730d317035130b3afbb
2016-03-30 22:11:33 +00:00
Yohei Yukawa
f6f0f5fbe9 Merge "Add IC#closeConnection()." into nyc-dev 2016-03-30 21:55:31 +00:00
Ruchi Kandoi
7ef20dd340 Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API."
This reverts commit 302710deaa02ad5fba5e39d9f0f652d3587b8b91.

Change-Id: I3e7e071838bae9460e126aac099b31f5213e3c6c
2016-03-30 14:23:58 -07:00
Dongwon Kang
0632d8ae71 TIF: Address comments on hardware manager related system APIs
Bug: 25726241
Change-Id: I0a3e7e8cf494d897fc04528ba719faa4150b9207
2016-03-30 13:25:45 -07:00
Mitchell Wills
6deac3313f Merge "Add WifiScanner API that accepts a WorkSource for scans" into nyc-dev am: 133240f
am: bb8ab1c

* commit 'bb8ab1ce70e1dcfad3ac40cc6285b30e2dbae302':
  Add WifiScanner API that accepts a WorkSource for scans

Change-Id: I74220a4ae8f6cc407809461dcf83254512e60ded
2016-03-30 19:21:27 +00:00
Yohei Yukawa
9f9afe526d Add IC#closeConnection().
It turns out that BaseInputConnection has still depended on a private
API named BaseInputConnection#reportFinish(), which was introduced
4 years ago to work around a UI freeze due to an unbalanced batch edit
count [1].  Note that such an unbalanced batch edit count cannot always
be avoidable.  It can easily occur in the following situations.
 - The current IME crashed during batch edit.
 - The user changed the View focus during batch edit.
 - The current IME called IMM#switchToNextInputMethod() during batch
   edit.

The remaining problem is that #reportFinish() is still an internal API
and only subclasses of BaseInputConnection can implement it, and IMM
calls it when and only when the current InputConnection is
BaseInputConnection or its subclass.  InputConnectionWrapper and any
other InputConnection implementations will never receive such a callback
to clean up InputConnection#{begin, end}BatchEdit(), which is considered
to be a major contributor to UI freeze.

To address the above issue, we unhide BaseInputConnection#reportFinish()
as InputConnection#closeConnection() so that application developers can
receive an appropriate callback to clean up internal state including
unfinished batch edit.

  [1] I5525d776916f0c42d5e6d4a4282aed590d7f0e9a
      9d69ecbf61a4a142c3f4cbb9d5659faa6f85e832

Bug: 24688781
Bug: 25332806
Change-Id: I234309c5880c9fe0b299b8bd0f8862796d4dda0d
2016-03-30 12:03:51 -07:00
Mitchell Wills
133240f565 Merge "Add WifiScanner API that accepts a WorkSource for scans" into nyc-dev 2016-03-30 18:43:23 +00:00
Rubin Xu
29f23aaf2e Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev am: 5b7ca24
am: 4b86800

* commit '4b8680005545101443e1fbbd3fc5d8a630ce6ae5':
  Add DevicePolicyManager API to install a client cert chain.

Change-Id: I0ff5173cc61f0c19ef5084c97b8fe34fdf9f78d5
2016-03-30 18:02:08 +00:00
Rubin Xu
5b7ca24f14 Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev 2016-03-30 17:46:18 +00:00
Makoto Onuki
4f1f7b0167 Merge "ShortcutManager: Support secondary text field." into nyc-dev am: ca0ee28
am: a3d8cdc

* commit 'a3d8cdca997e0577bcb1d9091880a0267e2d3f38':
  ShortcutManager: Support secondary text field.

Change-Id: I5262a756c5fe50e498192aea8e247f46d5742edc
2016-03-30 16:17:36 +00:00
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
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
Makoto Onuki
ca0ee285bb Merge "ShortcutManager: Support secondary text field." into nyc-dev 2016-03-30 15:30:17 +00:00
Philip P. Moltmann
a393be9319 Merge "Add cancelation signal to OnRequestPrinterIcon." into nyc-dev 2016-03-30 15:18:32 +00:00
Andrei Stingaceanu
b70ba1971c Merge "AfW custom lock screen message - API polish" into nyc-dev 2016-03-30 12:23:56 +00:00
Rubin Xu
b436591708 Add DevicePolicyManager API to install a client cert chain.
When installing a keypair the caller will have the option to specify a
certificate chain which will later be returned to whoever requests access
to the keypair via KeyChain.

Bug: 18239590
Change-Id: Id21ef026e31537db38d891cb9b712dd4fe7159c7
2016-03-30 11:57:58 +01:00
Andrii Kulian
933076d805 Refactor usages of Picture In Picture and Multi Window (1/4)
Bug: 27365860
Change-Id: I1590e430a12ceb84cb83da295e0bf7e4378fea96
2016-03-29 18:39:45 -07:00
Makoto Onuki
e3ae7ec14a ShortcutManager: Support secondary text field.
Bug 27548047

Change-Id: I2d184bab2c26e351b7326945fa0cacf826f16d1e
2016-03-29 16:42:12 -07: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
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
Mitchell Wills
d24427fabd Add WifiScanner API that accepts a WorkSource for scans
Bug: 27903217
Change-Id: I2303a2b91a4914e6cacc3108d29697f7a2dad056
2016-03-29 14:13:15 -07:00
Chet Haase
592960f2cd Merge "Add setHasOverlappingRendering() method" into nyc-dev am: fd48a32
am: 927e3c7

* commit '927e3c7a60cacee4cb71dca6ba9359a4b52a5a5d':
  Add setHasOverlappingRendering() method

Change-Id: I94364f36024c10a23a992fff716f8884ffa6be2e
2016-03-29 19:38:18 +00:00
Chet Haase
fd48a321c9 Merge "Add setHasOverlappingRendering() method" into nyc-dev 2016-03-29 19:19:14 +00:00