43206 Commits

Author SHA1 Message Date
Svetoslav
c5c203d6ef Merge "Print API updated." into klp-dev 2013-09-05 05:36:51 +00:00
Svetoslav Ganov
533e118f5a Merge "Addressing API councing suggestions for com.android.printservice" into klp-dev 2013-09-05 05:09:56 +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
Jeff Sharkey
b145ac127a Merge "Fix document management permission enforcement." into klp-dev 2013-09-05 03:04:09 +00: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
Svetoslav Ganov
adade10a51 Merge "KLP API Review: PrintDocumentAdapter documentation" into klp-dev 2013-09-05 02:27:32 +00:00
John Spurlock
631228b024 Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev 2013-09-05 02:09:29 +00:00
John Spurlock
a6fdd7f2ea Merge "SystemUI asset update." into klp-dev 2013-09-05 02:02:53 +00:00
John Spurlock
7436f07eb5 SystemUI asset update.
Plus a few framework resources used as status icons.

Bug:10502089
Change-Id: I66d3bcbb408a8e008cbb383cb3a1a55f97d3d64c
2013-09-04 21:52:37 -04:00
Jeff Sharkey
e37ea6123d Fix document management permission enforcement.
Allow both explicit holders of the MANAGE_DOCUMENTS permission and
those holding Uri grants to perform management tasks.

Extend grants for newly created documents when caller doesn't have
permission.  Revoke grants when deleting documents.

Test now writes actual content into picked file.  Workaround updated
flags for Drive app.

Bug: 10623211
Change-Id: Ia8e90b33e0fac8294b2cacb96d083c43fdf75aab
2013-09-04 18:43:34 -07:00
Ruben Brunk
f267dd1d79 Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev 2013-09-05 01:23:40 +00:00
Dianne Hackborn
8144585c58 Merge "Fix issue #10422349: Limit/change the battery history data in batterystats" into klp-dev 2013-09-05 01:21:32 +00:00
Wink Saville
e4bcd1b714 am 323af8b4: am aa5b0f8b: am ce1e3798: Add provisioning apn timeout.
* commit '323af8b49df3535977b5aa7f5b31c429d8a50f10':
  Add provisioning apn timeout.
2013-09-04 18:17:15 -07:00
Wink Saville
323af8b49d am aa5b0f8b: am ce1e3798: Add provisioning apn timeout.
* commit 'aa5b0f8bdadcfa1ddb041e09b815ea4b5986e901':
  Add provisioning apn timeout.
2013-09-04 18:14:07 -07:00
Wink Saville
aa5b0f8bda am ce1e3798: Add provisioning apn timeout.
* commit 'ce1e37981caec29df2671a6e2909f00da7f24a00':
  Add provisioning apn timeout.
2013-09-04 18:11:07 -07:00
Dianne Hackborn
49021f5f79 Fix issue #10422349: Limit/change the battery history data in batterystats
Don't include history in real checkins; have a new compact option
for bug reports.

Change-Id: I077f9218b365154f6bae9cc685c2c6b378e0283a
2013-09-04 18:03:40 -07: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
49ee555f23 Merge "Transition API changes from API council recommendations" into klp-dev 2013-09-04 23:47:45 +00:00
Glenn Kasten
04c58e9ec1 Merge "Java API for AudioTrack timestamps" into klp-dev 2013-09-04 22:29:19 +00:00
Glenn Kasten
948c2e6ff4 Java API for AudioTrack timestamps
This change adds android.media.AudioTimestamp and
android.media.AudioTrack.getTimestamp, with implementation, but hidden.

Change-Id: Ic314f04ff775baca05c57d19b5ea91133dbd0be1
2013-09-04 15:23:27 -07:00
Chong Zhang
dbb0b824a7 Merge "wifi-display: add a global setting to force WPS config method" into klp-dev 2013-09-04 22:07:05 +00: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
Lajos Molnar
171c63db92 Merge "Add subtitle support to VideoView." into klp-dev 2013-09-04 21:32:43 +00:00
Fabrice Di Meglio
3ab8e8847d Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev 2013-09-04 21:26:55 +00:00
Alan Viverette
3aa1824801 Merge "Implement drag-to-open in ActivityChooserView" into klp-dev 2013-09-04 21:17:00 +00:00
Romain Guy
cb039124c1 Merge "Don't draw with invalid display lists Bug #10301674" into klp-dev 2013-09-04 21:16:23 +00:00
Romain Guy
f66645671f Don't draw with invalid display lists
Bug #10301674

Change-Id: I900322dcb9b53f0eb82741c94d4ab1eaf939259e
2013-09-04 14:14:07 -07:00
Chet Haase
5f25f7c373 Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev 2013-09-04 21:13:31 +00:00
Timothy Knight
2629f27362 Camera2: Clarified docs for 3A regions.
Bug: 10545568
Change-Id: I0a76e7d063ceccb68707973abd312a1b909155ec
2013-09-04 21:07:13 +00:00
Timothy Knight
1b039b1d2e Merge "Camera2: Updated Rational for denom=0." into klp-dev 2013-09-04 20:25:35 +00:00
Dianne Hackborn
3cd28adc5d Merge "Fix issue #10427108: Google+ has long running process" into klp-dev 2013-09-04 20:22:27 +00:00
Fabrice Di Meglio
2bd961ae38 Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child
- related to "wrap_content"
- self bounds should include childs horizontal / vertical margin too
- so make height / width  computation follow similar pattern as top / bottom computation

Passing CTS tests: RelativeLayoutTest / RelativeLayout_LayoutParamsTest

Change-Id: Id019c2536e89d2d8a4991aaabf6de60aae2e263b
2013-09-04 12:30:19 -07:00
Ruben Brunk
6462be7fa0 Fix CameraService error flag when running HAL1 with API2.
Bug: 10620944
Change-Id: I72517a25bfe0e891ed150c568c37e04a9d6cc38c
2013-09-04 12:09:23 -07:00
David Christie
b12ba933f3 Make location QuickSettings multi-user compatible (b/10563313)
Change-Id: I8ae5238e66fa2d6890ffe5697d3e6d5f50413c3e
2013-09-04 11:36:17 -07:00
Chet Haase
cb96db8d14 Perform layout and invalidation after bringChildToFront()
Previously, calls to ViewGroup.bringChildToFront() or View.bringToFront()
would need to be followed by calls to requestLayout() and invalidate()
to force the container to redraw with the new child ordering. This
change calls requestLayout() and invalidate() automatically.

Issue #8667065 bringtoTop does not work

Change-Id: Id37ce7a64dead82119e49f7a1b28385cf0d1f20d
2013-09-04 11:28:57 -07:00
Derek Sollenberger
4c92f7cec7 Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev 2013-09-04 17:36:22 +00:00
Timothy Knight
23c8809568 Camera2: Updated Rational for denom=0.
Handle NaN and INF using the same semantics as Java floats. No longer
throw an exception if a rational is constructed with a zero-denominator.

This commit is required for the ITS pdk app, since without it, the app
fails when it tries to deserialize rational values that are
(incorrectly) set to 0/0.

Bug: 10337323

Change-Id: I890ec2092f2945abc0f531fc46f9a7f5c71d2dbf
2013-09-04 16:58:58 +00:00
Scott Main
703b34bb13 am f579f134: am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs
* commit 'f579f134ee9495571899be958983a1a242457603':
  clarify javadoc for constructors. bug: 10563421
2013-09-04 09:19:46 -07:00
Scott Main
f579f134ee am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs
* commit 'e0718c044bc81db0334f2973b9884b968c18ce07':
  clarify javadoc for constructors. bug: 10563421
2013-09-04 09:17:05 -07:00
Scott Main
e0718c044b am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs
* commit '605d56c0492536488c997c6ca0b85fd38fd4e19a':
  clarify javadoc for constructors. bug: 10563421
2013-09-04 09:13:57 -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
Derek Sollenberger
2696797939 Revert workaround for Skia bug now that Skia has been fixed.
bug: 7170836
Change-Id: If357767a5f66d539f775bce766e963b3d0df38bf
2013-09-04 10:50:06 -04:00
Tom O'Neill
2cf8138b91 Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev 2013-09-04 14:16:12 +00:00
John Spurlock
20c9606f57 Merge "Remove unused status bar icon stat_sys_secure." into klp-dev 2013-09-04 13:32:18 +00: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
Lajos Molnar
484ff7a922 Add subtitle support to VideoView.
Change-Id: Ibfde491a624272c4f9733098529ad70c6aa93fe0
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
2013-09-03 23:33:05 -07:00
Baligh Uddin
b414cbddb9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-04 04:43:28 +00:00
Aravind Akella
1f519d4682 Fix for build breakage. Remove documentation link to hidden registerListener API.
Change-Id: Iba5d623bf12f1b6654f570febcc65d591d309038
2013-09-03 19:37:24 -07:00