5784 Commits

Author SHA1 Message Date
John Spurlock
631228b024 Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev 2013-09-05 02:09:29 +00:00
Dianne Hackborn
3facfed942 am a7a8cdfa: am 7f71206d: Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev
* commit 'a7a8cdfab3af29d4bdec95abd6bde96824129e4e':
  Fix issue #10461600: KLP API Review: UndoManager
2013-09-04 17:58:58 -07:00
Adam Powell
1487466dc2 Add View#cancelPendingInputEvents API
This API allows an application to cancel deferred high-level input
events already in flight. It forms one tool of several to help apps
debounce input events and prevent things like multiple startActivity
calls, FragmentTransactions, etc. from executing when only one was
desired since it's otherwise not desirable for things like click
events to fire synchronously.

Change-Id: I60b12cd5350898065f0019d616e24d779eb8cff9
2013-09-05 00:55:20 +00:00
Dianne Hackborn
7f71206d00 Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev 2013-09-05 00:53:27 +00:00
Dianne Hackborn
b811e64cb3 Fix issue #10461600: KLP API Review: UndoManager
Hide, hide, hide!

Change-Id: Ie04825723d9392a4258e2d738828201ee387f7c6
2013-09-04 17:43:56 -07:00
Chet Haase
4918e7ad66 resolved conflicts for merge of 09ed0720 to master
Change-Id: I1ce1b48a9fb954caf4fd15237f2f608ac9c478fe
2013-09-04 17:19:44 -07:00
Tim Murray
932e78e990 Add YUV element convenience function.
Change-Id: Ie67dfba6a4c4f1913875ad9817c53e45d56809ae
2013-09-04 16:15:45 -07:00
Martijn Coenen
51b6322197 Remove legacy HCE APIs.
Bug: 10550349
Change-Id: Ie60942f9551e93bcfb597f7f2a5b9cc9bf21a11a
2013-09-04 14:49:46 -07:00
Chet Haase
d82c8ac4db Transition API changes from API council recommendations
Issue #10460684 KLP API Review: android.view.transition and android.animation
Issue #10570740 Transitions: inflate transition targets from xml

Change-Id: I7a3f6d3aece2fcafc5efd555d033f79e86635c98
2013-09-04 14:46:38 -07:00
John Spurlock
5e777f6685 Re-@hide activity-level FLAG_IMMERSIVE and helpers.
Un-@hidden in api 18, but probably should not have been.

The framework currently takes no action based on the flag,
making the docs misleading.

Bug:10460791
Change-Id: If6cc8791a85710897c8fe77cf6682d1460e3416e
2013-09-04 15:28:50 +00:00
Tom O'Neill
7275ecc509 am 70c2dd93: am 2cf8138b: Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev
* commit '70c2dd932bd585ed578ea684db06f17c4e5d24d3':
  Add LocationManager.MODE_CHANGED_ACTION broadcast
2013-09-04 07:21:16 -07:00
Tom O'Neill
2cf8138b91 Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev 2013-09-04 14:16:12 +00:00
Adam Skory
d3effc3941 am 1b6d0891: am 11254ade: Merge "Add provideAssistData attr to public.xml" into klp-dev
* commit '1b6d08916c88827839416afd2ac264d422c469e7':
  Add provideAssistData attr to public.xml
2013-09-04 05:27:10 -07:00
Adam Skory
16731d4dc0 Add provideAssistData attr to public.xml
http://ag/323631 added the provideAssistData
attribute to the Service manifest tag.

It did not, however, add that attribute to
public.xml - making it impossible to actually
build a service that defines said tag.

So, add it.

Now that the attribute is where it should be,
restore @link notation to ServiceInfo.java
without breaking the offline docs build
( see http://ag//340279 ).

Also, make some log warnings related to
providing assist data slightly more verbose.

Bug: 10573008
Change-Id: Ie2bcb411c182d69738a2fa4a74de3171b9b9c455
2013-09-04 12:30:47 +01:00
Tom O'Neill
40a86c24d2 Add LocationManager.MODE_CHANGED_ACTION broadcast
- Currently redundant with PROVIDERS_CHANGED_ACTION, but that may
change in the future

- Part of fix for b/10409275

Change-Id: I12daaf20e6546fd9e9dc71c599967fa0ad95e27f
2013-09-03 18:07:10 -07:00
Martijn Coenen
070cfb2da0 am a5259f62: am f48416de: Merge "Reader mode NFC API: move to callback model." into klp-dev
* commit 'a5259f6261ed4521d70d02328807aab34275a706':
  Reader mode NFC API: move to callback model.
2013-09-03 17:53:53 -07:00
Martijn Coenen
f48416dede Merge "Reader mode NFC API: move to callback model." into klp-dev 2013-09-04 00:48:20 +00:00
Alan Viverette
419c8ebbdc am b29cb9ec: am de59baab: Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev
* commit 'b29cb9ec4c343248dfd06b130459db13ae61142d':
  Ensure list scrolling API is in parity with view scrolling API
2013-09-03 16:38:58 -07:00
Alan Viverette
de59baab31 Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev 2013-09-03 23:33:03 +00:00
Alan Viverette
ba29906334 Ensure list scrolling API is in parity with view scrolling API
Change-Id: Icaf533c0085b80f3c52cc026e0da7468698724f9
2013-09-03 16:01:51 -07:00
Lajos Molnar
3e63d77837 am a7cd8835: am a861245f: Merge "VideoView: add addSubtitleSource" into klp-dev
* commit 'a7cd8835bb1392d5512012160bc8bd2ccad3efaf':
  VideoView: add addSubtitleSource
2013-09-03 15:54:54 -07:00
Lajos Molnar
a861245f06 Merge "VideoView: add addSubtitleSource" into klp-dev 2013-09-03 22:51:32 +00:00
Tom O'Neill
bac809db91 am 24bd1740: am d0e2a2e7: Merge "Improve constant names for settings injection API" into klp-dev
* commit '24bd1740df0bec25c4a9262e8c578bfb765c3ef6':
  Improve constant names for settings injection API
2013-09-03 13:30:59 -07:00
Tom O'Neill
d0e2a2e7a9 Merge "Improve constant names for settings injection API" into klp-dev 2013-09-03 20:25:56 +00:00
Martijn Coenen
dca11c9913 am e22cb840: am b143c669: Merge "Add drawable for Apdu Services, fix build." into klp-dev
* commit 'e22cb840d5691c073d24cfa56c0df7f706fa4405':
  Add drawable for Apdu Services, fix build.
2013-09-03 12:35:13 -07:00
Martijn Coenen
c85fb576b8 Add drawable for Apdu Services, fix build.
Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
2013-09-03 12:24:18 -07:00
Martijn Coenen
db587b6bfa am a3c92d65: am fb2f8337: NFC: @hide and remove abstract from processCommandApdu().
* commit 'a3c92d65de85a8b861f9aa3d5f7fb32732e73747':
  NFC: @hide and remove abstract from processCommandApdu().
2013-09-03 11:52:32 -07:00
Martijn Coenen
fb2f8337f6 NFC: @hide and remove abstract from processCommandApdu().
Replaced by new version with Bundle extras.

Bug: 10550349
Change-Id: If5f284c6d9b14ab32670ebc84881f459813b5b56
2013-09-03 11:40:35 -07:00
Mindy Pereira
ff4dd908c3 am 47fd3257: am 5c2dfa8a: Merge "Fix build; add new ScaleGestureDetector constructor" into klp-dev
* commit '47fd3257795e24c01308618bcd90fdfa537b1502':
  Fix build; add new ScaleGestureDetector constructor
2013-09-03 11:37:05 -07:00
Mindy Pereira
5c2dfa8a21 Merge "Fix build; add new ScaleGestureDetector constructor" into klp-dev 2013-09-03 18:32:02 +00:00
Mindy Pereira
6ad955ef97 Fix build; add new ScaleGestureDetector constructor
Change-Id: I1b6e7ef36ce79852acd6cefe03fc94143641ff0e
2013-09-03 11:27:02 -07:00
Mindy Pereira
a3ec1537b0 am 197602de: am 510caf30: Merge "Add doubletap swipe to scalegesturedetector" into klp-dev
* commit '197602ded7531ad2dc094975003d9b3e01f07a97':
  Add doubletap swipe to scalegesturedetector
2013-09-03 10:53:24 -07:00
Kenny Root
9b376a861e am 627f28c0: resolved conflicts for merge of 7e0609eb to klp-dev-plus-aosp
* commit '627f28c015b847b6026e0b86d0941728e69d7a38':
  Unhide functions to allow ECDSA support
  Add support for DSA and ECDSA key types
2013-09-03 10:49:43 -07:00
Mindy Pereira
510caf30d2 Merge "Add doubletap swipe to scalegesturedetector" into klp-dev 2013-09-03 17:38:36 +00:00
Martijn Coenen
edba13549f am ca12d455: am dd592e2a: Merge "HCE API review." into klp-dev
* commit 'ca12d4556ce19e64c8601de7299b05cfe5dfcbe6':
  HCE API review.
2013-09-03 10:31:10 -07:00
Kenny Root
7e0609eb67 Merge changes Ic710807d,I88dfcc8c into klp-dev
* changes:
  Unhide functions to allow ECDSA support
  Add support for DSA and ECDSA key types
2013-09-03 17:28:41 +00:00
Jean-Michel Trivi
5382bf11d2 am 85d8eb69: am 4a5931e2: Merge "Public API for RemoteControlClient ratings and editable metadata" into klp-dev
* commit '85d8eb6916d75acd2bfd9c7b632f53e87b9cc6da':
  Public API for RemoteControlClient ratings and editable metadata
2013-09-03 10:27:35 -07:00
Martijn Coenen
dd592e2a0d Merge "HCE API review." into klp-dev 2013-09-03 17:25:01 +00:00
Jean-Michel Trivi
4a5931e2ae Merge "Public API for RemoteControlClient ratings and editable metadata" into klp-dev 2013-09-03 17:19:55 +00:00
Kenny Root
c222ddd07f Unhide functions to allow ECDSA support
Bug: 10600582
Change-Id: Ic710807d7e771737521e0abd83af2f666ec1199c
2013-09-03 09:45:55 -07:00
Jeff Sharkey
b5bf56ed0a am 92c7406b: am 7c925042: Merge "New recents behavior to match spec." into klp-dev
* commit '92c7406b853f751d45a48306f9bc1899954382eb':
  New recents behavior to match spec.
2013-09-02 20:55:26 -07:00
Jeff Sharkey
7c92504206 Merge "New recents behavior to match spec." into klp-dev 2013-09-03 03:50:27 +00:00
Martijn Coenen
5b1e032ea7 Reader mode NFC API: move to callback model.
Using intents for reader mode doesn't work well for 2 reasons:
1) Intents are used to resolve, but in reader mode we already
   know where to resolve to. Additionally, dispatching an intent
   causes additional latency.
2) Using intents with foreground dispatch was tricky; for every
   call to onNewIntent() with a new tag, there was a call to
   onPause(), which effectively disabled reader mode again,
   causing a discovery loop.

Instead, let the app register a callback, and call that when
we discover a new tag. Also, add new flag to disable platform
sounds, and to change the presence check delay.

Bug: 10360259
Change-Id: I8373543d6cf2f7ca73c9b3e42bb8b51e3ac48cac
2013-09-02 20:43:57 -07:00
Jeff Sharkey
a2a772035f am 8c58b792: am cd6d7dee: Merge "Refactoring of DocumentsContract." into klp-dev
* commit '8c58b79243748eeb98b650c8e660a742ad876452':
  Refactoring of DocumentsContract.
2013-09-02 17:14:37 -07:00
Jeff Sharkey
cd6d7deec8 Merge "Refactoring of DocumentsContract." into klp-dev 2013-09-03 00:07:17 +00:00
Jeff Sharkey
251097b378 New recents behavior to match spec.
Updated behavior queries each documents root for recently modified
documents.  It uses a new variant of DirectoryLoader which limits the
maximum number of parallel queries to relieve memory pressure.  When
first started, it waits up to 500ms for everyone to finish, then
publishes whatever results are ready, and then refreshes results as
each straggler finishes.

New RootCursorWrapper that always blends in authority and rootId
columns, which are used for binding root details from blended cursors.

Bug: 10593596, 10329994
Change-Id: Icc0d4a2f1b6166edc72f78a4c88f444eeba6f2f0
2013-09-02 15:33:57 -07:00
Jeff Sharkey
ae9b51bfa3 Refactoring of DocumentsContract.
Combines related columns and constants onto the same class so they
are easier to discover.  Move back to surfacing roots with columns
so they are consistent with documents.

Advanced roots are represented with a flag instead of distinct
types.  Flags to indicate supporting of well-known media types,
instead of arbitrary an MIME filter.  Reintroduce well-formed rootId
to support recents.

Always use the expanded version of "documents" in constants, methods,
and argument names.

Refactor DocumentProvider method names to clearly distinguish if
a single item or multiple could be returned, and of which type.  Add
documentation to clearly define which methods have already been
overridden.

Bug: 10567506, 10567557
Change-Id: I981f26ab82f2b520a19aa1ce66f659de50d7fac0
2013-08-31 16:58:28 -07:00
Lajos Molnar
af30982435 VideoView: add addSubtitleSource
A way to add external subtitle file to VideoView.

Change-Id: Ic110238408550a5b4088851bc5da5e94eb58d831
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
2013-08-30 14:59:46 -07:00
Alan Viverette
8d1a22f0a8 am 3e09c1a3: am 083199ef: Merge "Update captioning APIs" into klp-dev
* commit '3e09c1a3c63b242b6d83671e8409f44d371cb9a3':
  Update captioning APIs
2013-08-30 14:42:49 -07:00
Matthew Williams
9d7c4d4a6e Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev 2013-08-30 21:39:15 +00:00