drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,061 Commits 1 Branch 0 Tags
Commit Graph

43563 Commits

Author SHA1 Message Date
Svetoslav
b966605a28 am c5c203d6: Merge "Print API updated." into klp-dev 
* commit 'c5c203d6ef8eea46f1c06f52e3ebfcc59c304760':
  Print API updated.
 2013-09-04 22:38:39 -07:00
Svetoslav
c5c203d6ef Merge "Print API updated." into klp-dev 2013-09-05 05:36:51 +00:00
Svetoslav Ganov
6bc20a54aa am 533e118f: Merge "Addressing API councing suggestions for com.android.printservice" into klp-dev 
* commit '533e118f5ad37005a77a2a6edc60afc56034d1e9':
  Addressing API councing suggestions for com.android.printservice
 2013-09-04 22:11:57 -07: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
Lorenzo Colitti
22f407b11e Add a function to replace all the link addresses. 
Bug: 10232006
Change-Id: I689ce4735999dac2ab5e1fae09d80b1f734292a1
 2013-09-05 13:02:54 +09:00
Jeff Sharkey
2a44d27b1d am b145ac12: Merge "Fix document management permission enforcement." into klp-dev 
* commit 'b145ac127ac25abd30597f798612b539107f8368':
  Fix document management permission enforcement.
 2013-09-04 20:07:04 -07:00
Jeff Sharkey
b145ac127a Merge "Fix document management permission enforcement." into klp-dev 2013-09-05 03:04:09 +00:00
John Spurlock
25d81a4c61 am eebf6895: Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev 
* commit 'eebf6895fde7ef0d87c91d31b3abb36d4a98df66':
  Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."
 2013-09-04 19:46:57 -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
Svetoslav Ganov
cf2a44e413 am adade10a: Merge "KLP API Review: PrintDocumentAdapter documentation" into klp-dev 
* commit 'adade10a5186636daaea50e90fddb50c3707d5ed':
  KLP API Review: PrintDocumentAdapter documentation
 2013-09-04 19:30:10 -07:00
Svetoslav Ganov
adade10a51 Merge "KLP API Review: PrintDocumentAdapter documentation" into klp-dev 2013-09-05 02:27:32 +00:00
John Spurlock
e82f1ce53e am 631228b0: Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev 
* commit '631228b0249de11b5dad37e7a09a251a5558430a':
  Re-@hide activity-level FLAG_IMMERSIVE and helpers.
 2013-09-04 19:11:51 -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
John Spurlock
82dda7b0c6 am a6fdd7f2: Merge "SystemUI asset update." into klp-dev 
* commit 'a6fdd7f2eae0d30c36f0eb9f8eac53d3b64b6827':
  SystemUI asset update.
 2013-09-04 19:05:05 -07: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
92d7ed1d59 am f267dd1d: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev 
* commit 'f267dd1d794237229fe71f37d54896ce54c9750d':
  Fix CameraService error flag when running HAL1 with API2.
 2013-09-04 18:28:05 -07:00
Dianne Hackborn
021a138bdc am 8144585c: Merge "Fix issue #10422349: Limit/change the battery history data in batterystats" into klp-dev 
* commit '8144585c5853d5f2dd5f30e4ab9c0abe7457d556':
  Fix issue #10422349: Limit/change the battery history data in batterystats
 2013-09-04 18:24:36 -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
4a18be9edc am e4bcd1b7: am 323af8b4: am aa5b0f8b: am ce1e3798: Add provisioning apn timeout. 
* commit 'e4bcd1b71408216cc5cdaf8d74001da611828f00':
  Add provisioning apn timeout.
 2013-09-04 18:19:58 -07: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
a7a8cdfab3 am 7f71206d: Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev 
* commit '7f71206d009e737e91c4c767183befe6006497c6':
  Fix issue #10461600: KLP API Review: UndoManager
 2013-09-04 17:56:11 -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
09ed072028 am 49ee555f: Merge "Transition API changes from API council recommendations" into klp-dev 
* commit '49ee555f239c79871b661e5ff135061f26665e1c':
  Transition API changes from API council recommendations
 2013-09-04 16:49:39 -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
44b4fd2cb9 am 04c58e9e: Merge "Java API for AudioTrack timestamps" into klp-dev 
* commit '04c58e9ec12c65c15738ba456f18a1f36416b0cc':
  Java API for AudioTrack timestamps
 2013-09-04 15:33:20 -07: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
411af374f9 am dbb0b824: Merge "wifi-display: add a global setting to force WPS config method" into klp-dev 
* commit 'dbb0b824a7e1dc6909988ec06a46158c05d26a92':
  wifi-display: add a global setting to force WPS config method
 2013-09-04 15:11:33 -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
a0d702908c am 171c63db: Merge "Add subtitle support to VideoView." into klp-dev 
* commit '171c63db9253e77c2bd11c53eb89b7c3c983669f':
  Add subtitle support to VideoView.
 2013-09-04 14:35:29 -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
eb4ed48f77 am 3ab8e884: Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev 
* commit '3ab8e8847d723fd3b114a4c895c5eeb4623412f4':
  Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child
 2013-09-04 14:31:37 -07: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
1d26f041ab am 3aa18248: Merge "Implement drag-to-open in ActivityChooserView" into klp-dev 
* commit '3aa18248013c25b80586d90dba71145d9aae8baf':
  Implement drag-to-open in ActivityChooserView
 2013-09-04 14:21:09 -07:00
Romain Guy
1c5a86ab60 am cb039124: Merge "Don\'t draw with invalid display lists Bug #10301674" into klp-dev 
* commit 'cb039124c145f95bd46fa6c84b585fbad88cf036':
  Don't draw with invalid display lists Bug #10301674
 2013-09-04 14:21:05 -07:00
Chet Haase
e4d5c8815a am 5f25f7c3: Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev 
* commit '5f25f7c37390e407b5c3d8545c5d6e0ef03b753a':
  Perform layout and invalidation after bringChildToFront()
 2013-09-04 14:17:25 -07: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