5907 Commits

Author SHA1 Message Date
Jeff Sharkey
372750aa6f am c7b2112f: am 5d7acbd8: Merge "Filter roots based on supported MIME types." into klp-dev
* commit 'c7b2112f1ba34013fafba69cd64e9b7aabc41fa6':
  Filter roots based on supported MIME types.
2013-09-05 14:26:27 -07:00
Jeff Sharkey
5d7acbd8be Merge "Filter roots based on supported MIME types." into klp-dev 2013-09-05 21:19:39 +00:00
Jeff Sharkey
923396b772 Filter roots based on supported MIME types.
Using flags to indicate supported types isn't very extensible, so
use newline-separated MIME types instead.

Bug: 10514613
Change-Id: I45641fc20b423b2a0bb2df7457c274f42aa6861a
2013-09-05 13:58:04 -07:00
Adam Powell
1d5ac31c0d am f094655c: am a73c3a54: Merge "Add View#cancelPendingInputEvents API" into klp-dev
* commit 'f094655c804e3983a538b7bc28266b173ea5c78b':
  Add View#cancelPendingInputEvents API
2013-09-05 12:43:32 -07:00
Adam Powell
a73c3a5488 Merge "Add View#cancelPendingInputEvents API" into klp-dev 2013-09-05 19:37:51 +00:00
Chet Haase
672fcd5c9a am 04f31501: am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev
* commit '04f31501602a87ae9526983f4a92e623b4d68bb3':
  Change build version from KEY_LIME_PIE to KITKAT
2013-09-05 10:13:34 -07:00
Chet Haase
a9fa33b366 Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev 2013-09-05 17:07:30 +00:00
Svetoslav
4fe055ad8d am e2144155: am 2def6148: Merge "Hiding some unneeded APIs," into klp-dev
* commit 'e2144155f63563112b5cde18d61dc04fa838e5ef':
  Hiding some unneeded APIs,
2013-09-05 10:06:31 -07:00
Tom O'Neill
5c199a8f0a am a3fa5138: am cef05c28: Incorporate new API council comments
* commit 'a3fa513893343767b2ed5198b96d419d77c6bd50':
  Incorporate new API council comments
2013-09-05 10:01:50 -07:00
Svetoslav
2def614854 Merge "Hiding some unneeded APIs," into klp-dev 2013-09-05 17:01:39 +00:00
Svetoslav
a76233ae84 Hiding some unneeded APIs,
1. Hide the MediaSize and Resolution constructors that take
   package and resource Id.

2. Fix a bug and docs in creating portrait and landscape media
   size.

Change-Id: If59992e355391de6ad6d14d4f7b3be8c8b6cc0e0
2013-09-05 09:50:28 -07:00
Tom O'Neill
cef05c28eb Incorporate new API council comments
- Split getStatus() into onGetSummary() and onGetEnabled()

- Call them on app's UI thread

- Allow runtime exceptions to propagate up

- Make a couple of more methods final to prevent subclasses from playing
around with the intent

- Remove explicit timing requirement from javadoc

- Mention that this will be restricted to system-image apps (will be
enforced by the actual settings code)

- b/10461474

Change-Id: Id22dd7a707c05de396ae4c5810e839ca734714c0
2013-09-05 09:45:03 -07:00
Amith Yamasani
d304af6989 Remove unused APIs and rename others based on API review
Restrictions challenge is only to be used by device admins.

Bug: 10461761
Change-Id: I3db1249e2ce99f386602de59ed930302bb0a97fb
2013-09-05 09:30:23 -07:00
Chet Haase
e8222dddaf Change build version from KEY_LIME_PIE to KITKAT
Issue #10631619 Change build version to KitKat

Change-Id: I6ad13f6169ad74204078d36929479998b498ad8b
2013-09-05 08:44:33 -07:00
Tim Murray
d2c576dba1 am 4965dbc3: am d2676f9b: Merge "Add YUV element convenience function." into klp-dev
* commit '4965dbc3149b1b1b4ff16b8da60cd31aed1c6e15':
  Add YUV element convenience function.
2013-09-05 00:41:18 -07:00
Tim Murray
d2676f9bd9 Merge "Add YUV element convenience function." into klp-dev 2013-09-05 07:36:43 +00:00
Svetoslav
162b5fbdca am b966605a: am c5c203d6: Merge "Print API updated." into klp-dev
* commit 'b966605a2884e9a92f060c69a9b82e051e2e798a':
  Print API updated.
2013-09-04 22:40:19 -07:00
Svetoslav
c5c203d6ef Merge "Print API updated." into klp-dev 2013-09-05 05:36:51 +00:00
Svetoslav
773f54de3d Print API updated.
1. Removed the updatePrinters API on PrinterDiscoverySession.
   Now re-adding a printer updates it.

2. Added getTrackedPrinters() API to allow a print service to
   figure out which printers' state should be tracked by the
   service.

3. Removed the APIs on PrintDocumentInfo that describe the
   layout of the content as they are not needed. For example,
   if the print attributes passed in layout require landscape
   mode, the the app should just create a PDF page with the
   wider side up and draw its content in portrait. The printer
   will then rotate the page.

Change-Id: Idd72c6e9c129e8b17eef1236573a99773f8ff0a2
2013-09-04 21:06:12 -07:00
John Spurlock
1014f3373a am 25d81a4c: am eebf6895: Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev
* commit '25d81a4c613a30f55217036dfba92a3c895f8d88':
  Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."
2013-09-04 19:50:02 -07:00
John Spurlock
eebf6895fd Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev 2013-09-05 02:44:29 +00:00
John Spurlock
322d77185d Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."
This reverts commit 5e777f668526104e7dd97d3972d35eb7b9eef5a2.

Change-Id: I6dc00f376cbbe34dafde3470d8e06c9123f81d8d
2013-09-05 02:39:46 +00:00
John Spurlock
f4490f4018 am e82f1ce5: am 631228b0: Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev
* commit 'e82f1ce53e51b129eddbc3fea27fe72cb402736b':
  Re-@hide activity-level FLAG_IMMERSIVE and helpers.
2013-09-04 19:14:42 -07:00
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