110146 Commits

Author SHA1 Message Date
Victoria Lease
f7a7766e16 am 250d3c27: Merge "prototype colour emoji font"
* commit '250d3c27a678e410b346a2602afef17170ee431a':
  prototype colour emoji font
2013-08-08 15:54:11 -07:00
David Christie
dd28b07c1a am eb2e139b: Merge "Unhide Context.APP_OPS_SERVICE"
* commit 'eb2e139b38eb740e06b691a6a8b690251377095e':
  Unhide Context.APP_OPS_SERVICE
2013-08-08 15:54:09 -07:00
Jeff Brown
96d5cd8f43 am 18ec40c4: Merge "Destroy surfaces when display is removed."
* commit '18ec40c44c936fd5146133ccc7446a4cd860b527':
  Destroy surfaces when display is removed.
2013-08-08 15:54:07 -07:00
Mathias Agopian
6ed79d6e17 am 9fb9a1c5: Merge "Fix a bug where window animation could be janky"
* commit '9fb9a1c5c1f7921309380476e1c99724663b214f':
  Fix a bug where window animation could be janky
2013-08-08 15:54:04 -07:00
Alan Viverette
a9b6a30f53 am 93e095b7: Merge "Add copy constructors for all widget-specific LayoutParams"
* commit '93e095b731f81e8ae410b605a5ffa955b8711edd':
  Add copy constructors for all widget-specific LayoutParams
2013-08-08 15:54:01 -07:00
Dirk Dougherty
d76ca645b7 am 6e4cc12a: am ec997806: am 1153eb46: am 4e847bd1: Doc change: fix federated urls.
* commit '6e4cc12a6c7487583dd1e5432fe9ee81c8aa2458':
  Doc change: fix federated urls.
2013-08-08 15:53:59 -07:00
Alan Viverette
13bcfdcabd am 7a2de061: Merge "Add API for scrolling AbsListView by a pixel amount"
* commit '7a2de0615f50ed40021cc1e931ea072b539719b8':
  Add API for scrolling AbsListView by a pixel amount
2013-08-08 15:53:56 -07:00
Todd Poynor
d159dc7cb5 am df89ca33: batteryservice: add battery current now and charge counter data
* commit 'df89ca3308544cfdd1ca12b22eac4a1d16e04410':
  batteryservice: add battery current now and charge counter data
2013-08-08 15:53:53 -07:00
Craig Mautner
1edbc766d0 am 9a04435e: Merge "Compare tasks not activities."
* commit '9a04435e5fb7c5869d81184736c97097e24fd881':
  Compare tasks not activities.
2013-08-08 15:53:51 -07:00
Amith Yamasani
1a18832c15 am d8e97493: Merge "Try again to cleanup all blocked apps"
* commit 'd8e974931ede2344e49416f1586279dab8107cab':
  Try again to cleanup all blocked apps
2013-08-08 15:53:48 -07:00
Brian Williammee
58b6d48945 am e2b1b8e2: Merge "Track latency of captive portal checks"
* commit 'e2b1b8e2adcc212f8505bf77a5d7e098d7c12c2f':
  Track latency of captive portal checks
2013-08-08 15:53:46 -07:00
Glenn Kasten
2021fba46c am d8405261: Merge "Update audio comments"
* commit 'd840526196108956c9e62e880b3f749cec11a5ec':
  Update audio comments
2013-08-08 15:53:43 -07:00
Dianne Hackborn
978efc2162 am feca78f7: Merge "Start adding IPC calls to retrieve proc stat data."
* commit 'feca78f7af973cbe68ffdeb8acb871820cf6458b':
  Start adding IPC calls to retrieve proc stat data.
2013-08-08 15:53:41 -07:00
Baligh Uddin
2246e8c76b am b83f6223: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'b83f62236c8ca879f826941fd605a2f123262239':
  Import translations. DO NOT MERGE
2013-08-08 15:53:38 -07:00
Baligh Uddin
45f2a4948f am 85ba45dd: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '85ba45dd62d1687473bc64728770a048fdea0a37':
  Import translations. DO NOT MERGE
2013-08-08 15:53:36 -07:00
Victoria Lease
250d3c27a6 Merge "prototype colour emoji font" 2013-08-07 22:51:22 +00:00
Victoria Lease
a0cbcd509f prototype colour emoji font
Bug: 9577689
Change-Id: Ia92460280fa00fc6849cfa8aa41ca06ae5866b4a
2013-08-07 15:46:16 -07:00
David Christie
eb2e139b38 Merge "Unhide Context.APP_OPS_SERVICE" 2013-08-07 22:44:36 +00:00
Jeff Brown
18ec40c44c Merge "Destroy surfaces when display is removed." 2013-08-07 21:32:32 +00:00
Mathias Agopian
9fb9a1c5c1 Merge "Fix a bug where window animation could be janky" 2013-08-07 20:36:26 +00:00
Alan Viverette
93e095b731 Merge "Add copy constructors for all widget-specific LayoutParams" 2013-08-07 20:31:45 +00:00
Alan Viverette
0a0e155cad Add copy constructors for all widget-specific LayoutParams
BUG: 10215589
Change-Id: I4c040091e216c87f851d6b617107f43729e55b0c
2013-08-07 13:24:09 -07:00
Dirk Dougherty
6e4cc12a6c am ec997806: am 1153eb46: am 4e847bd1: Doc change: fix federated urls.
* commit 'ec9978063794317b9934e2fc9ae4eb2de8c9b7a4':
  Doc change: fix federated urls.
2013-08-07 13:18:34 -07:00
Craig Mautner
2eb15342be Destroy surfaces when display is removed.
Fixes bug 10226153.

Change-Id: I4eb8b14258985768d36745260ad4e62ba6c78844
2013-08-07 13:13:35 -07:00
Mathias Agopian
9c72281d97 Fix a bug where window animation could be janky
SurfaceControl.closeTransaction() will block until the transaction
takes effect and this happens at the next vsync -- in practice
it means this call blocks for ~15ms.

Immediately after that we ask the choreographer to schedule the
next frame, which will happen at the next vsync. depending the
timing, this would cause the window manager to animate at 30 fps
instead of 60.

This is fixed here by calling the choreographer before we
call closeTransaction().

In the near future, we should be able to fix this by using
an offseted vsync for the window manager and it won't need
closeTransaction() to block at all.

Bug: 10209014
Change-Id: I33d0c5ecfc25154b2859f3023a8cda6e641826bf
2013-08-07 12:07:24 -07:00
David Christie
f45c9a0c6a Unhide Context.APP_OPS_SERVICE
Change-Id: Iab3e3fb2a32c3407c61abb694e21d84b50579d4f
2013-08-07 11:44:54 -07:00
Alan Viverette
7a2de0615f Merge "Add API for scrolling AbsListView by a pixel amount" 2013-08-07 18:38:15 +00:00
Todd Poynor
df89ca3308 batteryservice: add battery current now and charge counter data
Available for retrieval via future APIs if desired.  Dumped by dumpsys.
Not added to batterystats or ACTION_BATTERY_CHANGED intents at this point.

Also fixes a formatting problem in the existing dumpsys output for voltage.

Change-Id: I5320b19035914256fb872c13095c09c648dd522a
2013-08-07 18:33:12 +00:00
Craig Mautner
9a04435e5f Merge "Compare tasks not activities." 2013-08-07 18:26:49 +00:00
Craig Mautner
d0f964f93f Compare tasks not activities.
In order to determine if the topmost activity needs to be moved out
of the way, compare its task to the task of the source activity
rather than compare the activities themeselves.

Fixes bug 10182783.

Change-Id: Idd4542d7ddce8b7586ee47f100366bc47e07d54f
2013-08-07 11:16:33 -07:00
Amith Yamasani
d8e974931e Merge "Try again to cleanup all blocked apps" 2013-08-07 18:10:23 +00:00
Amith Yamasani
5e486f59c7 Try again to cleanup all blocked apps
Since the Restrictions feature was removed, some cleanup code was
added to unblock apps. But the cleanup is causing some runtime exceptions
due to happening too early in the boot up sequence. Moved the cleanup
to after boot_completed broadcast is received.

Bug: 10212758
Change-Id: Id42eff16b54c24ea48cf8b3a81f77ea801264edd
2013-08-07 11:06:44 -07:00
Brian Williammee
e2b1b8e2ad Merge "Track latency of captive portal checks" 2013-08-07 17:34:50 +00:00
Glenn Kasten
d840526196 Merge "Update audio comments" 2013-08-07 17:17:56 +00:00
Dianne Hackborn
feca78f7af Merge "Start adding IPC calls to retrieve proc stat data." 2013-08-07 17:15:05 +00:00
Baligh Uddin
b83f62236c Merge "Import translations. DO NOT MERGE" 2013-08-07 17:11:35 +00:00
Dianne Hackborn
23fb6e8418 Start adding IPC calls to retrieve proc stat data.
Also fix a bug where we were not correctly unparcelling service
duration data.

Change-Id: Ie9113b2e3a747622441b1939ffc45edb5803a10f
2013-08-07 10:08:22 -07:00
Baligh Uddin
85ba45dd62 Merge "Import translations. DO NOT MERGE" 2013-08-07 16:32:41 +00:00
Craig Mautner
039ceed41a Merge "Create SurfaceSession before creating DimLayer." 2013-08-07 16:27:20 +00:00
Craig Mautner
dee8bf0eb5 Create SurfaceSession before creating DimLayer.
Fixes "java.lang.IllegalArgumentException: session must not be null"

Change-Id: Id7e77a44e59e5169ed8944682ab79783631182dd
2013-08-07 09:24:11 -07:00
Ken Wakasa
c3a1914bd7 Revert "Reduce the transaction fee of getEnabledInputMethodSubtypeList"
This reverts commit e9a6f9713ca48aab9a6c87e0645cb0a0af946a11.

Change-Id: I611d31086d4f02aae5c7021ac92975bd92a59f34
2013-08-07 15:03:24 +00:00
Satoshi Kataoka
e9a6f9713c Reduce the transaction fee of getEnabledInputMethodSubtypeList
Bug: 8467480
Change-Id: Ic1fddfe433e097041fcb09d1fd341d77d7d8b13b
2013-08-07 17:12:58 +09:00
Svetoslav Ganov
32c5eb3bf8 Update the print job dialog and added notification assets.
1. Update the transition between the print job edit dialog and the
   generating print job dialog. Now the former shrinks into the
   latter.

2. Added most of the notification assets.

Change-Id: I84f35df5cb4f71b86a103c16ab87fd4d108b055b
2013-08-06 23:52:38 -07:00
Mathias Agopian
2275c6c8bf attempt to fix build. public api wasn't updated
Change-Id: I5afa7f20d60c1754e4d12318219af5a5861a85e0
2013-08-06 21:37:29 -07:00
Craig Mautner
3be4fed63c Merge "Add home StackBox to all DisplayContent." 2013-08-07 04:00:57 +00:00
Mathias Agopian
61be60b966 Merge "put TextureView back to async mode" 2013-08-07 03:19:23 +00:00
Mathias Agopian
24f43c9d2c put TextureView back to async mode
it's probably not strictly needed, but it guarantees
that the app won't deadlock itself while using a
TextureView -- this could happen if it blocked
in View.onDraw() waiting for the producer

this mimics the behavior TextureView always had.

Change-Id: I453339237a48dea91a10840b8cc0f5d2d84d1520
2013-08-06 20:16:12 -07:00
Jeff Tinker
8f6c998cfb Merge "Define error codes for MediaCodec.CryptoException" 2013-08-07 01:44:09 +00:00
Romain Guy
271c719224 Merge "Split assets atlas batches Bug #10185769" 2013-08-07 01:36:24 +00:00
Romain Guy
7f6d6b0370 Split assets atlas batches
Bug #10185769

The assets atlas contains assets that need to be blended and assets
that do not need to be blended. With a single merge id, currently
set to be the pointer to the atlas itself, draw ops merging could
generate batches of commands containing both opaque and translucent
assets. The blend state was chosen from only one of the assets in
the batch, leading either to inefficiencies (blending large opaque
assets) or incorrect behaviors (not blending translucent assets.)

This change introduces two new merge ids in the atlas: an opaque
key and a blend key. These keys are simple booleans set to false
and true respectively (the values do not matter really.) Their
memory addresses are used as the merge ids when createing draw ops
batches, allowing all opaque ops to be batched together and all
translucent ops to be batched together.

Change-Id: I114dba0533c44987e53864b471ccb28c811f2025
2013-08-06 18:35:01 -07:00