5806 Commits

Author SHA1 Message Date
Dianne Hackborn
9ef68ecda5 am 8d4816d8: am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev
* commit '8d4816d8fc9c1acbf377e7ee50b9871c4b5b8028':
  Issue #10461551: KLP API Review: AppOpsManager
2013-09-23 19:04:00 -07:00
Dianne Hackborn
9bb0ee9131 Issue #10461551: KLP API Review: AppOpsManager
Changed public constants from integers to strings.  Internally
everything is still integers, since we want that more efficient
representation for most things.

Changed the Callback interface to OnOpChangedListener.  We also
have a private versin that again takes an int, and tricks to
make both work.

Reworked the class documentation to be appropriate to the SDK
(as much as it can be); most of the existing documentation is
moved to the private implementation.  Also added documentation
of the MODE constants.

Change-Id: I4f7e73cc99fe66beff9194e960e072e2aa9458f8
2013-09-23 09:35:21 -07:00
Igor Murashkin
f17285c465 am 8c871175: am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev
* commit '8c87117588a1158823d94dec365897d33cec59bf':
  camera2: Rename CameraProperties to CameraCharacteristics
2013-09-22 09:57:40 -07:00
Igor Murashkin
68f40066c9 camera2: Rename CameraProperties to CameraCharacteristics
Bug: 10360518
Change-Id: I8667bdcc8c9528ace96dc675585f923004932641
2013-09-21 21:01:32 -07:00
Igor Murashkin
b960357438 am 78d5286e: am ca833c38: Merge "camera2: Add capture sequences and capture failures" into klp-dev
* commit '78d5286e0711092d1ec919c4524bfba9230d11d0':
  camera2: Add capture sequences and capture failures
2013-09-21 19:54:14 -07:00
Igor Murashkin
ca833c389b Merge "camera2: Add capture sequences and capture failures" into klp-dev 2013-09-22 02:44:06 +00:00
Jonathan Dixon
90102e2ccc resolved conflicts for merge of 1421827b to master
Simple resolve: two new methods added to same class.

Conflicts:
	core/java/android/webkit/WebViewFactoryProvider.java

Change-Id: Ic8b26f2a51279348b19a9c5b30d492f67d62ca81
2013-09-21 10:48:28 -07:00
Jonathan Dixon
6c025eaf29 Merge "WebView: add an API method to control web contents debugging" into klp-dev 2013-09-21 03:41:33 +00:00
Igor Murashkin
6bbf9dc5ae camera2: Add capture sequences and capture failures
- CaptureResult#getRequest is used to tie a result to a request (for convenience)
- Add new CaptureFailure class to describe capture failure
- Results/frame numbers also return frame numbers, sequence ids
- Captures now all return the sequence id
- A sequence id onComplete is available in the CaptureListener

Bug: 10360518
Change-Id: I9ebaa45698c718a1185b5ae920b7975925fe2f60
2013-09-20 19:00:50 -07:00
Svetoslav
69337346ab am 939d9592: am b39ce63d: Merge "Offer to enable a print service after it is installed." into klp-dev
* commit '939d95924a88f4376f301db72b95e096f69fda7f':
  Offer to enable a print service after it is installed.
2013-09-20 18:23:50 -07:00
Svetoslav
b39ce63d28 Merge "Offer to enable a print service after it is installed." into klp-dev 2013-09-21 01:15:47 +00:00
Svetoslav
d8f391b4e0 Offer to enable a print service after it is installed.
The user has to explicitly enable a print service from the settings UI
before using it. Usually, users very rarely if at all interact with print
services, therefore all print service management task are performed from
the print settings. We also have to get user consent warning that the
user's data is about to be given to a third-party app. We now post a
notification allowing the user to go directly to the settings screen to
turn the service on.

bug:10447510

Change-Id: Iea56c0825f0bf38328ad94912f0ea5576e9339b3
2013-09-20 17:40:25 -07:00
Igor Murashkin
c94a8322cb am 5b65ad41: am ab98a0b1: Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev
* commit '5b65ad41b2a748fe5c3c24107ffe767ce8a8d8dc':
  camera2: Add more camera device states, make #openCamera async.
2013-09-20 16:26:36 -07:00
Igor Murashkin
ab98a0b116 Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev 2013-09-20 23:21:51 +00:00
Adam Lesinski
5fc67f98b9 am a35ff661: am d473ebb7: Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev
* commit 'a35ff66127d07117e93268482d7e9719abfd58c3':
  Surfaces ParcelFileDescriptor#parseMode() as API
2013-09-20 16:05:21 -07:00
Adam Lesinski
d473ebb7c4 Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev 2013-09-20 22:59:12 +00:00
Adam Lesinski
eb8c3f93ed Surfaces ParcelFileDescriptor#parseMode() as API
Moves ContentResolver#modeToMode() to ParcelFileDescriptor#parseMode()

bug:10711271
Change-Id: I28a5de4ca70adfbec4caf739863b77f0fd7fd9a4
2013-09-20 14:59:34 -07:00
Svetoslav
6e1e8b17c5 am c0e1ae01: am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" into klp-dev
* commit 'c0e1ae0176b2ce23ea1b19883507cd920712289a':
  Move PdfDocument to android.graphics.pdf
2013-09-20 11:21:05 -07:00
Christopher Tate
0719715586 am 654aad21: am 9c5cc571: Merge "Support for "not the home app you\'re looking for" metadata" into klp-dev
* commit '654aad21609642f7d0891962d72c0dfd4077fb94':
  Support for "not the home app you're looking for" metadata
2013-09-20 09:58:18 -07:00
Igor Murashkin
5c9eaf6796 camera2: Add more camera device states, make #openCamera async.
* Move CAMERA_IN_USE, MAX_CAMERAS_IN_USE to StateListener#onError
* Copy CAMERA_DISABLED to StateListener#onError

Bug: 10360518
Change-Id: Idd8cf42e1511d12682018588b2b413116cf65116
2013-09-19 19:01:32 -07:00
Svetoslav
facc08c775 Merge "Move PdfDocument to android.graphics.pdf" into klp-dev 2013-09-20 01:14:02 +00:00
Svetoslav
44634bbefc resolved conflicts for merge of db7659e0 to master
Change-Id: I6b56fabd07b18dfcb25be83834e4f248f8aa4a40
2013-09-19 17:44:13 -07:00
Svetoslav
6811f4e92c Move PdfDocument to android.graphics.pdf
1. Move PdfDocument to android.graphics.pdf.

2. Changed the PdfDocument as per API concil request.

3. Updated the documentation.

bug:10461180
bug:10552565
bug:10681585
bug:10552336

Change-Id: I08e15b34cf37bb064248c887e6f59808019cafe8
2013-09-19 17:12:47 -07:00
Christopher Tate
9c5cc571e5 Merge "Support for "not the home app you're looking for" metadata" into klp-dev 2013-09-19 19:46:20 +00:00
Christopher Tate
bd413f6c05 Support for "not the home app you're looking for" metadata
* Make sure that pm.getHomeActivities() returns the activity metadata
  as well, so that the caller can trace the reference

* Add a public canonical name for that metadata key

Bug 10749961

Change-Id: Ic4d0750d61001ffe5af180398f042afa30eea1ce
2013-09-19 12:31:49 -07:00
Svetoslav
81d4014c59 Hiding a method that was never meant to be public.
The hide javadoc annotation had a type, thus leaking the API.

bug:10552358

Change-Id: Iec4e203d0786efbe6afbd9b6995f11642935336c
2013-09-19 10:09:49 -07:00
Jean-Michel Trivi
80326646b7 am 58910a74: am 1608f496: Merge "Public API for RemoteController" into klp-dev
* commit '58910a746ebf915264b87536ab25148a94714ca2':
  Public API for RemoteController
2013-09-19 08:57:33 -07:00
Jean-Michel Trivi
1608f496a3 Merge "Public API for RemoteController" into klp-dev 2013-09-19 15:49:40 +00:00
Jean-Michel Trivi
a83487e8c6 Public API for RemoteController
Public API, under system|signature permission for access to
  currently playing metadata and playback state.
Public API for sending media key events.

Bug 8209392

Change-Id: I39b9309ca3fb1bc305492bad98740df0ae0842b2
2013-09-18 18:12:51 -07:00
Amith Yamasani
0125d4bd25 am 2f9fd33f: am e8c01ddb: Merge "Changes to PFD based on API review" into klp-dev
* commit '2f9fd33fd9cad3bbd8edffefa9c65cbeb7e50c94':
  Changes to PFD based on API review
2013-09-18 16:47:50 -07:00
Amith Yamasani
e8c01ddbe7 Merge "Changes to PFD based on API review" into klp-dev 2013-09-18 23:43:11 +00:00
Amith Yamasani
b433bb8c96 Changes to PFD based on API review
Removed boolean param to ask for exception on detached fd. Use a
subclass of IOException instead.

Bug: 10461576
Change-Id: If7db16120297edcdb7d5d5905ed453003be0e38e
2013-09-18 16:35:05 -07:00
Svetoslav
932916b3e7 am 6d0db04b: am 7b3990ec: Merge "Update the print dialog." into klp-dev
* commit '6d0db04bed79f371b537feae3efa9b5e6fe8876c':
  Update the print dialog.
2013-09-18 14:27:03 -07:00
Raph Levien
0a675ae85a am 954f0d7b: am ba1abbba: Merge "Revert "Revert "Take the input device into account for meta state""" into klp-dev
* commit '954f0d7b775b67c3ceeb7d3f646479fbc420fbd7':
  Revert "Revert "Take the input device into account for meta state""
2013-09-18 14:26:45 -07:00
Kenny Root
b5a14f0fc9 resolved conflicts for merge of 1995a7de to master
Change-Id: I9915ae06d460696b24cbee935738267911baa580
2013-09-18 14:23:58 -07:00
Svetoslav
7b3990ec81 Merge "Update the print dialog." into klp-dev 2013-09-18 21:08:49 +00:00
Raph Levien
ba1abbba1f Merge "Revert "Revert "Take the input device into account for meta state""" into klp-dev 2013-09-18 20:40:26 +00:00
Dianne Hackborn
b9466db4a5 Merge "Finish issue #10779747: Calendar Storage crash observed..." into klp-dev 2013-09-18 20:34:11 +00:00
Kenny Root
157ae82b6c am faebc647: am bd49a1da: Merge "Change case of "keyset" to "keySet" for manifests" into klp-dev
* commit 'faebc6470d06e889e65b85adda825dbca52b44ac':
  Change case of "keyset" to "keySet" for manifests
2013-09-18 13:18:33 -07:00
Kenny Root
bd49a1dadf Merge "Change case of "keyset" to "keySet" for manifests" into klp-dev 2013-09-18 20:15:26 +00:00
Raph Levien
14f10e5d5f Revert "Revert "Take the input device into account for meta state""
This reverts commit 3954fd9a05232cb6f7fc52aa49a0b34c1539028a, which
is equivalent to re-applying 8a1597b39632956cdbcb6b76874ccca786047d4c.

The change ("Take the input device into account for meta state") was
valid but caused CTS test failures because the test was wrong. The
test injected a key event with the meta state missing. This faulty
test was masked by the old toggle behavior.
2013-09-18 13:01:11 -07:00
Raph Levien
c4d7562a93 am 21b0c88b: am c540f8e9: Merge "Revert "Take the input device into account for meta state"" into klp-dev
* commit '21b0c88b3c290141f9a7593bb249ab117af48b91':
  Revert "Take the input device into account for meta state"
2013-09-18 12:49:33 -07:00
Raph Levien
c540f8e9d7 Merge "Revert "Take the input device into account for meta state"" into klp-dev 2013-09-18 19:44:16 +00:00
Svetoslav
013b816ac7 Update the print dialog.
1. The print dialog was resizable and as a result when printers
   come and go its size changes which looks bad. The dialog is
   now trying to be maximally large limited by a max size or the
   screen - whichever is smaller. This required moving from
   GridLayout to several LinearLayouts since the former does not
   support distribution of empty space evently between the items
   in a row. Also we want all items in a column of inputs to be
   of equal size (the spinners specifically).

2. Added labeledBy attribute to associate a view with another one
   that serves as its label for accessibility purposes. We have
   lebelFor attribute but it is not useful in most layout files
   since it has to refer the auto-generated id of a view which
   usually appears later in the layout file, thus generating a
   compilation error. This was needed for the accessibility support
   of the print dialog.

bug:10631660

2. Disabling the spinners or the print button did not produce
   visual feedback leading to user frustration.

bug:10741907

Change-Id: I0c12eddabc4035bc7becd1b86c1f1b8fdcf4289c
2013-09-18 12:31:26 -07:00
Jonathan Dixon
322fe808e3 am b7bdf38b: am 01fc0884: Merge "Update APIs for the Chromium WebView" into klp-dev
* commit 'b7bdf38bf1d202c844e667f3074bc43f298f11f9':
  Update APIs for the Chromium WebView
2013-09-18 12:22:20 -07:00
Jonathan Dixon
01fc088462 Merge "Update APIs for the Chromium WebView" into klp-dev 2013-09-18 19:14:09 +00:00
Dianne Hackborn
6285a32f74 Finish issue #10779747: Calendar Storage crash observed...
...while setting up a new user from settings.

We can now delay broadcasts when there are enough background services
currently starting (still set to 1 for svelte devices, 3 for normal
devices).

Add new intent flag to not allow receivers to abort broadcasts, which
I use to fix an issue with the initial BOOT_COMPLETED broadcast not
actually requesting pss data at the right time -- it can now be sent
as an ordered broadcast without the ability for the receivers to cancel
it.

Change-Id: I51155bbbabe23e187003f3e2abd7b754e55d3c95
2013-09-18 12:09:47 -07:00
Kenny Root
add560288a Change case of "keyset" to "keySet" for manifests
Bug: 10461185
Change-Id: Ibfe8cc6e716ac8b76ed7c05c26c332673479b7d8
2013-09-18 11:16:49 -07:00
Raph Levien
3954fd9a05 Revert "Take the input device into account for meta state"
This reverts commit 8a1597b39632956cdbcb6b76874ccca786047d4c. That
commit broke some of the handling of meta state, which in turn caused
CTS test failures, notably bug 10210151 (CTS:
android.text.method.cts.BaseKeyListenerTest#testBackspace_withSendKeys
is failing on KLP).

So this revert fixes those test failures, but leaves bug 8303489
(Pressing shift on the hardware keyboard messes with unrelated
keypresses, including virtual ones) still present. We'll plan to
address that in a future release.

Change-Id: Iea42c643b6d08f33cbd2ed1747e8de3b5f8116a6
2013-09-18 11:03:02 -07:00
Lajos Molnar
161f7c9be8 am 0fe0fe95: am b8462457: Merge "Misc. media API changes" into klp-dev
* commit '0fe0fe95015040f4b413bfad8c32e125e8d824d0':
  Misc. media API changes
2013-09-18 10:26:51 -07:00