33443 Commits

Author SHA1 Message Date
Eino-Ville Talvala
66a83ae650 Merge "Camera2: Add metadata keys and enum values" into klp-dev 2013-08-14 20:20:43 +00:00
Matthew Xie
a5c81e8636 Merge "LE: Add peripheral role support (1/4)" into klp-dev 2013-08-14 08:14:09 +00:00
Andre Eisenbach
f46b21aa99 LE: Add peripheral role support (1/4)
Initial stack support for the LE peripheral role.

Change-Id: I6222493488822b4289b90888ccc97ad9306f54d1
2013-08-14 00:48:24 -07:00
Matthew Xie
08c34c326f Merge "LE: Add instance ID to descriptors (1/4)" into klp-dev 2013-08-14 07:27:49 +00:00
Andre Eisenbach
25b9cf953b LE: Add instance ID to descriptors (1/4)
If a remote devices offers multiple descriptors with the same UUID, the
instance ID is used to differentiate between them.

Change-Id: I0c36494c980c86abd23f9647196af8d59ef663e9
2013-08-13 19:25:05 -07:00
Igor Murashkin
d48233e1e6 Merge "camera2: Clear up docs for CameraDevice#configureOutputs" into klp-dev 2013-08-14 00:16:42 +00:00
destradaa
0682809ad0 Add support in the platform for Flp Geofencing.
Change-Id: I0fb0e276d3a06322697bb5d46323779aca1f78c5
2013-08-13 16:00:04 -07:00
John Spurlock
f464511a7b Merge "Sysui flag-related doc fixes." into klp-dev 2013-08-13 22:35:57 +00:00
Igor Murashkin
53f91c5c26 camera2: Clear up docs for CameraDevice#configureOutputs
Change-Id: Id2397ca17c5968cb4dfdb337ea56be9d5f481669
2013-08-13 14:37:42 -07:00
John Spurlock
7facd7f6f1 Sysui flag-related doc fixes.
Add new flags to existing flag listings, fix a broken @link, and
tweak wording.

Change-Id: Iebc4f5fc1c6fc3f8685c6252f88d8044fe08b79d
2013-08-13 17:34:04 -04:00
Fabrice Di Meglio
6311399403 Merge "Code cleaning for Drawables" into klp-dev 2013-08-13 20:13:46 +00:00
Craig Mautner
1beff47871 Merge "Fix Configuration layout direction comparison." into klp-dev 2013-08-13 19:38:01 +00:00
Eino-Ville Talvala
5a32b20ccc Camera2: Add metadata keys and enum values
- Insert metadata enum ints into CameraMetadata
- Insert metadata Keys into relevant files
- Remove some dead code in CameraMetadata

Generated from /system/media/camera/docs.

Change-Id: I3d864ad8c7add5f35ca740860cb2883d54a0791e
2013-08-13 12:35:57 -07:00
Craig Mautner
31678b52e4 Fix Configuration layout direction comparison.
If the Configuration layout direction is not changing don't indicate
that it has changed. When the indication is made incorrectly it
causes the window manager to believe that the configuration has
changed and it will start freezing the screen and setting up
animations. Bad jank is the result.

In Configuration.updateFrom() anytime that the screenLayouts were
different the code was setting ActivityInfo.CONFIG_LAYOUT_DIRECTION
in the return bitmask. Even if the only difference was between
UNDEFINED fields. This fix makes sure that the layout direction
field has actually changed before setting
ActivityInfo.CONFIG_LAYOUT_DIRECTION in the return bitmask.

In Configuration.diff() if the passed Configuration had
SCREENLAYOUT_LAYOUTDIR_UNDEFINED the code was setting
ActivityInfo.CONFIG_LAYOUT_DIRECTION in the return bitmask. This fix
makes sure that if the passed Configuration has fields set to
SCREENLAYOUT_*_UNDEFINED then corresponding bits will no longer be set
in the returned bitmask.

Fixes bug 10291622.
Fixes bug 10247094.

Change-Id: If26de662206fe85dc4671adbae39dfb99dc1038c
2013-08-13 09:23:13 -07:00
Svetoslav Ganov
371c46fe29 Merge "Remove exceptions from the printer discovery session APIs." into klp-dev 2013-08-13 05:31:24 +00:00
Svetoslav Ganov
18d9c3cc6c Remove exceptions from the printer discovery session APIs.
It is not possible for a client to check whether the session is not
closed and add/update/remove printers atomically. It is always possible
that in between the two method calls the session is closed. Therefore,
we cannot enforce the exceptions.

Change-Id: If0e89e4429c4c360515da8f4bbe0ea3781e8e8fd
2013-08-12 22:22:49 -07:00
Jose Lima
56e0d6b86c Merge "Allow configuration of Toast gravity settings" into klp-dev 2013-08-13 02:24:35 +00:00
Kristian Monsen
4c73749614 Merge "Change the exception msg" into klp-dev 2013-08-13 01:35:29 +00:00
Selim Gurun
1eb8b726d3 Change the exception msg
Change the exception msg to better identify the webview version.

Change-Id: I64c9a433144f9aa0362ad6c9217da92acbb655bc
2013-08-12 18:29:33 -07:00
Michael Wright
51b4a40ef5 Merge "Expose vendor and product IDs for InputDevices" into klp-dev 2013-08-13 00:04:08 +00:00
Michael Wright
54e56946d1 Expose vendor and product IDs for InputDevices
Change-Id: I08665a41e474cbedd10b342eeae20d2ca7c03ac0
2013-08-12 16:39:59 -07:00
Alan Viverette
890db42b0d Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev 2013-08-12 20:47:39 +00:00
Svetoslav
b9b1701dca Merge "Make PrintFileDocumentAdapter non-final." into klp-dev 2013-08-12 20:34:12 +00:00
Svetoslav
9abf735387 Make PrintFileDocumentAdapter non-final.
Change-Id: I89a46bf766f5270dfaba7482b7b7cd997e19821a
2013-08-12 13:32:52 -07:00
Alan Viverette
b339cc5bcb Not create context menu when mouse right click outside list/grid items
Even if mouse right click outside of list/grid items, a context menu
is made. But there is no item of the list, so a context menu info is
null. Then, NullPointerException happens at onCreateContextMenu()
using a context menu info.
For fixing the problem, check mTouchMoude and mMotionPosition to
distingusih where is clicked, on a list item or not, before
performButtonActionOnTouchDown() which makes a context menu.

Manually merged from AOSP contribution.

Change-Id: I778be73df36abbfd4ba9534d8e7a1ece6844ed40
Author: henrik baard <henrik.baard@sonymobile.com>
2013-08-12 13:29:15 -07:00
Chet Haase
cd89feb9d1 Merge "pause/resume for Animators" into klp-dev 2013-08-12 19:57:23 +00:00
Chet Haase
8aa1ffb0ed pause/resume for Animators
It is now possible to pause Animator-based animations. Pausing an
animator causes it to hold the current time/value indefinitely, or
until end/cancel/resume is called. When resume() is called, it continues
from where it left off.

There is a new listener interface on Animator, AnimatorPauseListener,
which can be used to listen to pause/resume events.

Change-Id: I77d1535e792fb7bf349f549a0ac0a0d85958cb47
2013-08-12 11:51:32 -07:00
Selim Gurun
1232c51eed Merge "Add the API to support webview printing" into klp-dev 2013-08-12 18:27:38 +00:00
Selim Gurun
2167c0be56 Add the API to support webview printing
Bug: 10190508
Change-Id: I47fc46bb1ea632876048b29621843f781c47aab7
2013-08-12 10:55:39 -07:00
Martin Kosiba
9a68f82f37 Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE
Cherry pick of master I210dbab01c8b8d1eeff316a23c5d011e2e6c2a74

This exposes the super_onDrawVerticalScrollBar method which will
be called by the WebViewChromium implementation.

Change-Id: I3fe348633c163514e67b7712f1e9a086dee3d338
2013-08-12 13:15:20 +01:00
Jeff Sharkey
998cfa2c63 Merge "API to discover granted Uri permissions." into klp-dev 2013-08-12 03:59:58 +00:00
Jeff Sharkey
08da7a1143 API to discover granted Uri permissions.
Now that granted Uri permissions can be persisted across reboots,
offer APIs to discover them. Returns incoming or outgoing grants
matching the requested flags and mask. Add helper method to discover
"open" documents using this new API and filtering for non-documents.

Require that callers own at least of the filtering packages to avoid
exposing all grants. Switch internal grant tracking to use ArrayMap.

Change-Id: I0a755f221d0d160b411f8d3cfc48279b64345733
2013-08-11 20:56:15 -07:00
Jeff Sharkey
6e14b22cfe Merge "APIs for multiple external storage devices." into klp-dev 2013-08-12 00:13:35 +00:00
Jeff Sharkey
1abdb71230 APIs for multiple external storage devices.
Provide developer APIs to discover application-specific paths on
secondary external storage devices.  Covers files, cache, and OBB
directories.  Apps will not have write access outside their package-
specific directories on secondary devices, so only primary storage is
exposed through Environment.

Creation of .nomedia files will be handled by FUSE daemon in future
change.

Change-Id: Ifcce6201a686d80269d7285adb597c008cf8fa7c
2013-08-11 17:07:44 -07:00
Svetoslav Ganov
c7c4d6dd4d Merge "Refinement of the print service APIs." into klp-dev 2013-08-11 21:42:54 +00:00
Svetoslav Ganov
798bed6cc7 Refinement of the print service APIs.
1. Factored out the printer discovery APIs of a print service in a
   dedicated session object that is created by the print service on
   demand. This ensures that added/removed/updated printers from
   one session do not interfere with another session.

2. Updated the app facing APIs to pass in a document info along
   with a printed file. Also exposed the print file adapter so
   apps that create a temporary file for printing can intercept
   when it is read by the system so the file can be deleted.

3. Updated the print service documentation.

Change-Id: I3473d586c26d8bda1cf7e2bdacb441aa9df982ed
2013-08-11 14:40:05 -07:00
Wink Saville
a48ad8bd85 PROXY_SERVICE may be missing and its reference null.
Protect ourselves from when PROXY_SERVICE is missing
and mProxyService is null.

Bug: 10267814
Change-Id: Ia329376218e246cdde3d70b578c18466d48a6383
2013-08-10 11:22:31 -07:00
Zhihai Xu
97aaa8f01b Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev 2013-08-10 01:47:07 +00:00
Fabrice Di Meglio
404db929c4 Code cleaning for Drawables
- fold if statements (probably due to a previous refactoring - that was a bit crazy isnt it ?)

Change-Id: Ie893bb50aa6f81e4d7a6b1438e8271ee487b51d6
2013-08-09 17:24:55 -07:00
Romain Guy
96aadf837c Merge "Prevent AsyncTask from creating too many threads Bug #10228005" into klp-dev 2013-08-10 00:07:22 +00:00
Dianne Hackborn
b0037316c4 Merge "More stuff I need for the proc stats UI." into klp-dev 2013-08-09 23:19:07 +00:00
Dianne Hackborn
69cb00b8dd More stuff I need for the proc stats UI.
Change-Id: I5f05b79bc4d5766a80f2db9d20ba8078b60c1b00
2013-08-09 16:16:56 -07:00
Romain Guy
719c44e03b Prevent AsyncTask from creating too many threads
Bug #10228005

From the ThreadPoolExecutor documentation:

  - If fewer than corePoolSize threads are running, the Executor
    always prefers adding a new thread rather than queuing.
  - If corePoolSize or more threads are running, the Executor
    always prefers queuing a request rather than adding a new thread.
  - If a request cannot be queued, a new thread is created unless
    this would exceed maximumPoolSize, in which case, the task will
    be rejected.

Before this change AsyncTask could create up to 128 threads because
of the limited queue of 10 items (the capacity of a blocking queue
is fixed.)

This change increases the size of the queue to 128 items and reduces
the maximum number of threads to the number of CPU cores * 2 + 1.
Apps can still submit the same number of tasks.

Change-Id: I015d77b53b6a9fda39c618830b34d45a10de5571
2013-08-09 16:15:18 -07:00
Chet Haase
2b2d313e86 Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev 2013-08-09 22:50:35 +00:00
Chet Haase
2632b5d0d2 Reduce amount of invalidation when old-style animations are running
Previously, old animations (view.animation.*) would cause invalidations on
both the area of the child view and then the entire parent area. There's no
reason for the second invalidation; only the child area need be redrawn.

Issue #10229470 Old animation code in View.draw() may be invalidating too much

Change-Id: I4d0d16321e20b2f34dc579eacf5d3841aed33d6d
2013-08-09 15:05:14 -07:00
Matthew Xie
fe3807a5b2 Bluetooth MAP profile - sms and mms support initial check-in
bug:10116530

Change-Id: I57d022005bcff5bc3e56438a81ac92566f957744
2013-08-09 15:01:07 -07:00
keunyoung
f6c7a5fd66 Merge "add local focus mode and input event injection API to Window" into klp-dev 2013-08-09 21:51:30 +00:00
Martijn Coenen
4bcc8ee682 Merge "NFC: always upper-case parsed AIDs." into klp-dev 2013-08-09 20:50:52 +00:00
Alan Viverette
be11c364e7 Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev 2013-08-09 20:46:02 +00:00
Martijn Coenen
62c196abd2 NFC: always upper-case parsed AIDs.
Also added activity intent action for Tap&Pay settings.

Change-Id: I5648e1ded3b79a3363899d1cab8aec55842b3e22
2013-08-09 13:43:34 -07:00