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

112623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
c27aba779b am 03e5039a: am 2069b004: am 76fcf6c7: am 07c9bcc3: am 4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs 
* commit '03e5039a9857e321ce949a73c4c59e18fcac6934':
  Add a few more samples to browser.
 2013-09-04 22:34:48 -07: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
cbed0d27a6 am 6bc20a54: am 533e118f: Merge "Addressing API councing suggestions for com.android.printservice" into klp-dev 
* commit '6bc20a54aa934ecd958c6122b101510dac3a01d5':
  Addressing API councing suggestions for com.android.printservice
 2013-09-04 22:14:30 -07: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
3e7e5a3953 am d60228f5: am 7f95595f: Merge "Asset drop, icons for common MIME types." into klp-dev 
* commit 'd60228f51168719cf00d57b43a91cc2fbf4828e8':
  Asset drop, icons for common MIME types.
 2013-09-04 20:09:23 -07:00
Jeff Sharkey
762ad1f95a am 2a44d27b: am b145ac12: Merge "Fix document management permission enforcement." into klp-dev 
* commit '2a44d27b1d90239e3a71386f55632ed8017b1cc6':
  Fix document management permission enforcement.
 2013-09-04 20:09:19 -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
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
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
ae894e78ca am cf2a44e4: am adade10a: Merge "KLP API Review: PrintDocumentAdapter documentation" into klp-dev 
* commit 'cf2a44e413bd38d6c3595c9ca782e07f502b8bce':
  KLP API Review: PrintDocumentAdapter documentation
 2013-09-04 19:31:59 -07: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
90240fc68e am 61cbaa43: am 0e907e83: Merge "SystemUI demo mode." into klp-dev 
* commit '61cbaa432df468efe88ca3335d9fecc3c8b44545':
  SystemUI demo mode.
 2013-09-04 19:22:23 -07:00
John Spurlock
8dba04801a am 88997434: am 079db748: Merge "Remove signal/wifi activity indicator icon overlays." into klp-dev 
* commit '88997434aacdffae647c3f13b5f4438807635e46':
  Remove signal/wifi activity indicator icon overlays.
 2013-09-04 19:22:19 -07: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
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
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
2dd417de0f am 82dda7b0: am a6fdd7f2: Merge "SystemUI asset update." into klp-dev 
* commit '82dda7b0c666c5772c9b604d947793ea84f8fe7d':
  SystemUI asset update.
 2013-09-04 19:07:55 -07: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
Todd Poynor
2e9992583c Merge "BatteryProperty: Add average current property" 2013-09-05 01:37:29 +00:00
Ruben Brunk
8e8393aea4 am 92d7ed1d: am f267dd1d: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev 
* commit '92d7ed1d5962557a13a24f740ac89afd0afccf37':
  Fix CameraService error flag when running HAL1 with API2.
 2013-09-04 18:32:19 -07:00
Dianne Hackborn
1703c54a0e am 021a138b: am 8144585c: Merge "Fix issue #10422349: Limit/change the battery history data in batterystats" into klp-dev 
* commit '021a138bdc0a8d1561cd7a429936afb8983c68b0':
  Fix issue #10422349: Limit/change the battery history data in batterystats
 2013-09-04 18:32:16 -07:00
Wink Saville
125b2f8d09 am 4a18be9e: am e4bcd1b7: am 323af8b4: am aa5b0f8b: am ce1e3798: Add provisioning apn timeout. 
* commit '4a18be9edc88caa329c2beb7180fabc26d46f76b':
  Add provisioning apn timeout.
 2013-09-04 18:32:11 -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