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

111951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Murray
4965dbc314 am d2676f9b: Merge "Add YUV element convenience function." into klp-dev 
* commit 'd2676f9bd93c333ae2c7f3ca284d0fef5a7e146b':
  Add YUV element convenience function.
 2013-09-05 00:38:56 -07:00
Tim Murray
d2676f9bd9 Merge "Add YUV element convenience function." into klp-dev 2013-09-05 07:36:43 +00:00
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
Dirk Dougherty
03e5039a98 am 2069b004: am 76fcf6c7: am 07c9bcc3: am 4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs 
* commit '2069b00416c5da60a84ad75a9a9efe56a455e187':
  Add a few more samples to browser.
 2013-09-04 22:32:07 -07:00
Dirk Dougherty
2069b00416 am 76fcf6c7: am 07c9bcc3: am 4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs 
* commit '76fcf6c73e7dda99ec80e6da616bee26c2a088e6':
  Add a few more samples to browser.
 2013-09-04 22:29:02 -07:00
Dirk Dougherty
76fcf6c73e am 07c9bcc3: am 4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs 
* commit '07c9bcc3a60a8860b65aa43badd8ab1f1858522b':
  Add a few more samples to browser.
 2013-09-04 22:26:54 -07:00
Dirk Dougherty
07c9bcc3a6 am 4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs 
* commit '4ef51c3c4298cbd7980029b6b1cad2f6696f7bb5':
  Add a few more samples to browser.
 2013-09-04 22:23:48 -07:00
Dirk Dougherty
4ef51c3c42 Merge "Add a few more samples to browser." into jb-mr2-docs 2013-09-05 05:19:41 +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
Dirk Dougherty
2826df3f3d Add a few more samples to browser. 
Change-Id: Iac7acc22a8dd71950b32e2c35c82f53abc34168a
 2013-09-04 21:55:47 -07: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
d60228f511 am 7f95595f: Merge "Asset drop, icons for common MIME types." into klp-dev 
* commit '7f95595fe7c08e62e0468d1c718cdf6ebed974b0':
  Asset drop, icons for common MIME types.
 2013-09-04 20:07:06 -07: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
7f95595fe7 Merge "Asset drop, icons for common MIME types." into klp-dev 2013-09-05 03:04:18 +00: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
61cbaa432d am 0e907e83: Merge "SystemUI demo mode." into klp-dev 
* commit '0e907e8350d01ea6d8093470fd5cf7d1ae008de3':
  SystemUI demo mode.
 2013-09-04 19:20:31 -07:00
John Spurlock
88997434aa am 079db748: Merge "Remove signal/wifi activity indicator icon overlays." into klp-dev 
* commit '079db748746ebb1565279114fb957135f75ba4cf':
  Remove signal/wifi activity indicator icon overlays.
 2013-09-04 19:20:28 -07:00
John Spurlock
0e907e8350 Merge "SystemUI demo mode." into klp-dev 2013-09-05 02:19:19 +00:00
John Spurlock
079db74874 Merge "Remove signal/wifi activity indicator icon overlays." into klp-dev 2013-09-05 02:18:31 +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
0b14db3cf5 Asset drop, icons for common MIME types. 
Bring in latest assets from UX. Map common MIME types to specific
icons.

Bug: 10510022
Change-Id: I01ea8749ca5515a04efcbc15eb0c8cbb43e5e7ad
 2013-09-04 18:46:56 -07: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
Sandeep Siddhartha
454cf31dbd am 228b3510: Merge "Move the hotword code to KeyguardHostView" into klp-dev 
* commit '228b35109a6b8d75f1963178f3eff262a06db411':
  Move the hotword code to KeyguardHostView
 2013-09-04 18:11:10 -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
Sandeep Siddhartha
228b35109a Merge "Move the hotword code to KeyguardHostView" into klp-dev 2013-09-05 01:08:23 +00: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
Dianne Hackborn
7f71206d00 Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev 2013-09-05 00:53:27 +00:00
Sandeep Siddhartha
eec83dcadd Move the hotword code to KeyguardHostView 
- Try hotword detection on Pattern unlock screen as well - disabled in
  this CL
- Explicitly stop hotword detection when starting the assist intent.

Change-Id: I3d22a9029abf888431113b86e4410ea9e9866c57
 2013-09-04 17:47:34 -07: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