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

112094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Tim Murray
932e78e990 Add YUV element convenience function. 
Change-Id: Ie67dfba6a4c4f1913875ad9817c53e45d56809ae
 2013-09-04 16:15:45 -07:00
Scott Main
465b36d822 am 52ea7f57: am f56076ee: am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit '52ea7f57ed08ea982dcb125b564b5509ef8dc3b6':
  update dashboards for 9/13
 2013-09-04 15:46:50 -07:00
Scott Main
52ea7f57ed am f56076ee: am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit 'f56076eefba47dad9b66b3011f487dc9a22e2756':
  update dashboards for 9/13
 2013-09-04 15:43:40 -07:00
Scott Main
f56076eefb am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit '966b9d467dbb21d7bbc0a49067110ff4ddaffb89':
  update dashboards for 9/13
 2013-09-04 15:40:27 -07:00
Michael Wright
7e0eecc436 am 9f8c2d22: Merge "Fix keymap build dependencies and variable name collisions" into klp-dev 
* commit '9f8c2d229febff3a331afd26137ba5abb173a84d':
  Fix keymap build dependencies and variable name collisions
 2013-09-04 15:39:52 -07:00
Andy McFadden
c0046f2167 Add #! to 'am' shell script 
Shell script needs to start with #! for exec().

Bug 10606037

Change-Id: I594da6f0433e838dcf5b45b991188ceaa52d9bd1
 2013-09-04 15:39:51 -07:00
Michael Wright
9f8c2d229f Merge "Fix keymap build dependencies and variable name collisions" into klp-dev 2013-09-04 22:37:05 +00:00
Scott Main
966b9d467d am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit '002057bf0452168fd88eb81c2d36f02cfb260769':
  update dashboards for 9/13
 2013-09-04 15:36:59 -07:00
Scott Main
002057bf04 Merge "update dashboards for 9/13" into jb-mr2-docs 2013-09-04 22:35:04 +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