Commit Graph

13231 Commits

Author SHA1 Message Date
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
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
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 302710deaa.

Change-Id: I3e7e071838bae9460e126aac099b31f5213e3c6c
2016-03-30 14:23:58 -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
      9d69ecbf61

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
Chet Haase
15b6ba5859 Add setHasOverlappingRendering() method
View.hasOverlappingRendering() is an important performance tweak that
subclasses can override to do the right thing return false when appropriate
to avoid expensive operations when view is translucent).
But this requires subclassing View to get this behavior.

This new API allows the property to be set from outside, enabling
standard views to have this behavior set. When the new method is called,
the behavior will derive from whatever it was set to. Otherwise, it
will default to the old/overriden behavior.

Issue #16561361  Make hasOverlappingRendering settable from outside/XML

Change-Id: If0fbc8667cdb82b1d85e795e782716a07196f3c0
2016-03-29 11:01:27 -07:00
Shubham Ajmera
e2f645068a Merge changes from topics \'list_default_method\', \'map_default_methods\' into nyc-dev am: 1f8fb9f
am: dea351a

* commit 'dea351a2d53b57769edb60eb284786679b5ed74d':
  Add OpenJDK 8 java.util.List Default Methods
  Port OpenJDK8 changes in java.util.Map

Change-Id: Ie083d5b46679742040f899973061049a64977220
2016-03-29 15:07:15 +00:00
Shubham Ajmera
1f8fb9f95a Merge changes from topics 'list_default_method', 'map_default_methods' into nyc-dev
* changes:
  Add OpenJDK 8 java.util.List Default Methods
  Port OpenJDK8 changes in java.util.Map
2016-03-29 14:59:00 +00:00
Shubham Ajmera
444a51d1c9 Add OpenJDK 8 java.util.List Default Methods
and corresponding tests.

Added replaceAll and sort methods from the upstream except for the
CopyOnWriteArrayList.

Added forEach method along with the above two methods in
CopyOnWriteArrayList.

Bug: 27693350
Bug: 27540008

(cherry-picked from commit 6206c9f2e7)

Change-Id: I9efbd66b65c06b50fc20f63d477c25a05a8fae02
2016-03-29 15:50:38 +01:00
Shubham Ajmera
338dd5b6c9 Port OpenJDK8 changes in java.util.Map
& add tests.

The CL add tests for map default methods added in Java 8 - getOrDefault,
putIfAbsent, remove(K, V), replace(K, V, V), replace(K, V), forEach,
replaceAll, compute, computeIfAbsent, computeIfPresent, putIfAbsent,
merge.

Methods have been made synchronzed in Hashtable. They are using the
default map methods instead of taking the upstream changes.

Replace(K, V, V) in LinkedHashMap has been  overridden as it doesn't
record access when the replace method doesn't make any replacement.

Bug: 27426743

(cherry-picked from commit 6206c9f2e7)

Change-Id: Ie27ea5bd42ddbfa751b89f9eacfb290a3d69f4bb
2016-03-29 15:25:21 +01:00
Gustav Sennton
1b257e485b Merge "Remove the system api method WebViewFactory.getWebViewPackageName" into nyc-dev am: bf0982d
am: d187015

* commit 'd187015b0db4c4ec40ca343b4dbee57e2e835012':
  Remove the system api method WebViewFactory.getWebViewPackageName

Change-Id: I05776787c59d9f96b1e6f4278068cd70ffbe964b
2016-03-29 13:56:35 +00:00
Andrei Stingaceanu
16187903b4 AfW custom lock screen message - API polish
DevicePolicyManager:
* getDeviceOwnerLockScreenInfo now returns CharSequence as it returns a string
  for display to a user
* setDeviceOwnerLockScreenInfo
** accepts CharSequence, not String as this is a string displayed to the user
** Returns void; throws an appropriate runtime exception on failure

Bug: 27531295
Change-Id: I30528569cfa66ee76f857fbee1c3196f821718fd
2016-03-29 13:04:29 +00:00
Gustav Sennton
79f1216eb1 Remove the system api method WebViewFactory.getWebViewPackageName
We no longer user this method and it doesn't return any useful
information.

Bug: 27719581

Change-Id: Id282f1501cde9a7d7cc1fe66016cfb54956686c5
2016-03-29 13:36:02 +01:00
Philip P. Moltmann
e54d79c4cd Add cancelation signal to OnRequestPrinterIcon.
Change-Id: I072d2c15e8df104a8b902c10d14d9f02040ace5f
2016-03-28 17:13:34 -07:00
Tao Bao
c0d4b37a16 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev am: 9971d02
am: 85b0ba3

* commit '85b0ba3cc369cc5106a5368434524ae479dfa00d':
  UpdateEngine: Add resetStatus() as system API.
2016-03-28 21:17:04 +00:00
Andrii Kulian
0b7964bdba Merge "Fix API numbering issues" into nyc-dev am: 162c9d04
am: b4da6e3

* commit 'b4da6e3d99be85efdd431bd6dfefcade43d27ac5':
  Fix API numbering issues
2016-03-28 21:16:29 +00:00
Brad Ebinger
7fde28455a Merge "Add VIA number column to CallLog Database" into nyc-dev am: 900f163
am: ca3c301

* commit 'ca3c3012df230e0c49906e18fdea93992d6313b2':
  Add VIA number column to CallLog Database
2016-03-28 21:16:01 +00:00
Lifu Tang
9c33c073cd Merge "Added missing constants to GnssMeasurement" into nyc-dev am: a89a392
am: 46d2e76

* commit '46d2e7673cd70797f0b1521bbf1aedc9adffe830':
  Added missing constants to GnssMeasurement
2016-03-28 21:13:22 +00:00
Tao Bao
9971d02c38 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev 2016-03-28 19:51:36 +00:00
Andrii Kulian
162c9d0425 Merge "Fix API numbering issues" into nyc-dev 2016-03-28 19:28:23 +00:00
Brad Ebinger
900f1635c0 Merge "Add VIA number column to CallLog Database" into nyc-dev 2016-03-28 19:27:20 +00:00
Lifu Tang
a89a392aef Merge "Added missing constants to GnssMeasurement" into nyc-dev 2016-03-28 18:22:28 +00:00
Andrii Kulian
ad462701a8 Fix API numbering issues
This fixes issues with API numbering introduced in
2e751b8c77.

Original commit replaced 'minimalSize' resource with 'minimalWidth' and
'minimalHeight' and 'make update-api' shifted the numbering of other resources.
This change reverts the shift, reuses number of 'minimalSize' and adds
another one new.

Bug: 27528326
Change-Id: I7d327f00043c2bd2aab7285e03223a042e8c97a3
2016-03-28 11:16:31 -07:00