Commit Graph

33420 Commits

Author SHA1 Message Date
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
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
Geoffrey Borggaard
9b59e5aa9c Merge "Add a name to the DeviceOwner" into klp-dev 2013-08-09 20:27:26 +00:00
Geoffrey Borggaard
334c7e32d4 Add a name to the DeviceOwner
We will need to display the name of the device owner (the human
readable name of the institution) to the user.
"This device is managed by google.com"

Change-Id: Ic33b6530c19cb14a118245692697205de3911a58
2013-08-09 15:56:52 -04:00
Fabrice Di Meglio
88dced2936 Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev 2013-08-09 19:54:19 +00:00
Dianne Hackborn
60444fd594 Add method for adding two ProcessStats objects together.
Also move file reading code over to ProcessStats.

Change-Id: Ib42272b90a408a494044965e98beed16c0b3f8a5
2013-08-09 12:08:17 -07:00
Alan Viverette
26bb253b40 Fix padding adjustment for scrollbars in View, FastScroller
BUG: 10224791,10248282
Change-Id: Ia89d2cbea163b7cad567ea37161552c1cfd66045
2013-08-09 10:40:50 -07:00
keunyoung
30f420fd6a add local focus mode and input event injection API to Window
- This enables keyboard navigation for window without focus.
 - FLAG_LOCAL_FOCUS_MODE puts window into local focus mode.
 - Application needs to put window in local focus mode, control focus, and
   inject events to make dpad navigation work.
 - Window in local focus mode does not interact with window manager or ime
   regarding focus related events.
 - Also renamed ViewRootImpl.dispatchKey to dispatchInputEvent to allow both key and touch events injection.

Change-Id: I8e8561f29e0dade3797fb7ae3ee7690e6b7f8895
2013-08-08 19:45:21 -07:00
Fabrice Di Meglio
4155e2e175 Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP
This issue has been actually revealed by a fix for bug #7034321 (Need Drawable RTL support)
where I identified an issue with Drawables resolution in TextView (was missing a call to
resetResolvedDrawables() and resolveDrawables()).

- add missing resetResolvedDrawables() and resolveDrawables() in TextView.setRelativeDrawablesIfNeeded()
- fix View.resolveDrawables():

this was a bit trycky as View.resolveDrawables() was wrongly supposing that the layout direction was
resolved and it could access View.getLayoutDirection() and could position the PFLAG2_DRAWABLE_RESOLVED
bit.

Dont forget that resolution of RTL properties (layoutDirection, Drawables ...) is happening in
View.measure() but in our case (TexView constructor) we still need to resolve the Drawables.

So now, be sure that we cannot resolve the Drawable if layout direction has not being resolved and the
raw layout direction is LAYOUT_DIRECTION_INHERIT.

But we can also "cheat" if the raw layout direction is LAYOUT_DIRECTION_LTR or LAYOUT_DIRECTION_RTL
or LAYOUT_DIRECTION_LOCALE as its resolution will give the same value :-)

Change-Id: I7a242d918697e1e1c2febf229e8edf1866b855be
2013-08-08 18:22:08 -07:00
Jeff Sharkey
8a65f5b871 Merge "Allow packages.list access with new GID." into klp-dev 2013-08-09 00:44:55 +00:00
Jeff Sharkey
184a0100ab Allow packages.list access with new GID.
The FUSE daemon is using packages.list to map from package name to
appId after it drops permissions, so create a new "package_info" GID
to grant read access.

Also switches FileUtils to use Libcore.os.

Change-Id: I9451ca4e90e8a985526805c6df0888a244a1db36
2013-08-08 17:38:13 -07:00
Wink Saville
89d16f7597 am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '9b7b4450185e723dc7021f7e8bae4a12d4dd5606':
  If in a mobile captive portal is detected enable fail fast.
2013-08-08 17:10:34 -07:00
Wink Saville
292a92e337 am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '7c00be48fcb1986db14915beef549e925b5670d2':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
2013-08-08 17:10:32 -07:00
Wink Saville
f5f75cd8f2 Merge "Merge commit '81132d51' into fix-merge-conflict" into klp-dev 2013-08-09 00:09:25 +00:00
Wink Saville
f35f3201db Merge commit '81132d51' into fix-merge-conflict
* commit '81132d51':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.

Change-Id: I624732a5c29427bc22a156ccd46e6ff727af09c5
2013-08-08 16:51:46 -07:00
Jeff Brown
0933570357 Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev 2013-08-08 23:30:31 +00:00
destradaa
541ba71073 Merge "Add FlpHal layer to support Location Batching." into klp-dev 2013-08-08 22:57:25 +00:00
Wink Saville
9b7b445018 am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '02eab434ad9faa25291e63023b7e66698ca457a8':
  If in a mobile captive portal is detected enable fail fast.
2013-08-08 15:46:55 -07:00
Wink Saville
7c00be48fc am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '55adb390bb96175db9abee3ead349a98b4dc4262':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
2013-08-08 15:46:52 -07:00
Wink Saville
81132d5197 am b9b4321b: am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
* commit 'b9b4321b756ac6e44650031ebfe0134508f60eaa':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.
2013-08-08 15:46:49 -07:00
Jesse Hall
6a6bc216d1 Use new ISurfaceComposer::destroyDisplay method
Bug: 10191053
Change-Id: I3ecc6880db4a4c77c6db4e8b50faa9b4021d17c6
2013-08-08 15:44:15 -07:00
destradaa
1af4b0280a Add FlpHal layer to support Location Batching.
Change-Id: Ia3a57d869dfb3f067a1b95fa66d54f311ddcfdc3
2013-08-08 15:27:38 -07:00
Wink Saville
4d87d91dfe Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev 2013-08-08 22:07:27 +00:00
Wink Saville
35152f13b3 Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev 2013-08-08 22:06:21 +00:00