110245 Commits

Author SHA1 Message Date
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
Wink Saville
7f6ee2ec90 Check that hipri has started.
I needed to test the result of startUsingNetworkFeature, otherwise
on mobile networks that are slow to come up, we won't detect
warm SIMs after booting.

Bug: 9962943
Change-Id: Ib638a4e43867ecaa85d6abff65643b77a63526b6
2013-08-07 11:02:57 -07:00
Joe Malin
68091b9e10 am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178
* commit '72289702e5e134eb189a208aa6e2fb3edb041f7a':
  DOC CHANGE: Fixed bug 10210178
2013-08-07 10:47:59 -07:00
Joe Malin
72289702e5 am 6180f104: DOC CHANGE: Fixed bug 10210178
* commit '6180f104cf8c97316e77a4bbfd95992c2b7649cb':
  DOC CHANGE: Fixed bug 10210178
2013-08-07 10:44:45 -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
Joe Malin
6180f104cf DOC CHANGE: Fixed bug 10210178
Change-Id: If6e955ea287e66df20a441ab44e7bd4557645348
2013-08-07 09:53:09 -07:00
The Android Open Source Project
9d42e438cb Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I9936340ef1544aad7b8115dc37e3fb9094ed0e2d
2013-08-07 09:43:07 -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
Marco Nelissen
53d86f6e49 am f5cfe708: am e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
* commit 'f5cfe708a61ecbd89c9db6e09c185ccb3ab87a4a':
  When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together.
2013-08-07 08:44:43 -07:00
Marco Nelissen
f5cfe708a6 am e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
* commit 'e8acd367acb82bd80deed31467adcdd9ab83248b':
  When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together.
2013-08-07 08:42:54 -07:00
Marco Nelissen
e8acd367ac Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together." 2013-08-07 15:39:39 +00:00
Marco Nelissen
ca4553d33f am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit '7ffbcb2892e66059ec0cce26b4d6054c7778c711':
  Guarantee that all db related files are deleted together.
2013-08-07 08:38:12 -07:00
Marco Nelissen
7ffbcb2892 am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit 'ca5d99ac41f00c282b9101d9b84da0338f15798e':
  Guarantee that all db related files are deleted together.
2013-08-07 08:34:17 -07:00
Marco Nelissen
ca5d99ac41 Merge "Guarantee that all db related files are deleted together." 2013-08-07 15:30:51 +00:00
Chris Wren
9afc50deda Animate the heads up notification into the shade.
Bug: 10001874
Change-Id: I14ece05dbc29a93a551381c6ddc3cbbb8a331430
2013-08-07 11:07:21 -04:00
Chris Wren
4c91312d55 ensure heads up slider is initialized.
Change-Id: I4095b89133b64dd5c5d81e3b7fab288ee5538654
2013-08-07 11:07:21 -04:00
Chris Wren
0f2aa68e3c proper geometry for heads up on tablets.
also some code cleanup since things are getting complicated.

Bug: 10074485
Change-Id: I900a60f0fdda8d2ef1bcfe01035d6f716e14aa56
2013-08-07 11:07:21 -04: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
Dianne Hackborn
1d3ff5b454 Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
2013-08-06 20:34:49 -07: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
Adam Skory
dfc7fd7818 Extend assist context to foreground services
Add Service.onProvideAssistData(Bundle) which will be
called on foreground Services that have the new attr
in their manifest of provideAssistData = true;

Rename private reference to e.g. "getTopActivityExtras"
as "getAssistContextExtras" - do not rename the relevant
permission, since it is already public.

In ActivityManagerService, request extras both from the
top activity and from any foreground services with the
above attribute. Extend PendingActivityExtras as
PendingAssistExtras with a list of Services from which
extras are expected.

Reduce the timeout to or reporting extras from 4 sec to
just 500 ms.

Bug: 9526331
Change-Id: Ia03b96e8189033a68ae9c514c8cea0199a19bce8
2013-08-07 02:20:44 +01:00
Alan Viverette
2f3317a06d Add API for scrolling AbsListView by a pixel amount
Change-Id: Ib0fc48879991fd467242d8dc337db419edb12acf
2013-08-06 18:19:48 -07:00
Jeff Sharkey
1377be0fb6 Merge "Recents in create, uniform item layouts." 2013-08-07 01:18:02 +00:00
Jeff Sharkey
b156f4bf8c Recents in create, uniform item layouts.
Show recent directories in a separate fragment, and save as serialized
versions of new DirectoryStack. Cleaner behavior around recents and
search, instead of treating them as pseudo-Documents.

More uniform item layouts between list and grid, including both date
and size information, and originating storage root in recents. Avoid
clashing directory loaders by assigning unique numbers. Promote
list/grid switching up into activity.

Change-Id: I9a93460b896067ca036d7e772eeabde31face2e1
2013-08-06 18:16:21 -07:00
Craig Mautner
9d808b1f48 Add home StackBox to all DisplayContent.
Each display needs a stack and a stack box to contain windows.

Fixes bug 10161525.

Change-Id: Ic617cdf5a082ae68f0589e826ecbb37d8fba52ac
2013-08-06 18:07:13 -07:00
jangwon.lee
740c1dd97e Guarantee that all db related files are deleted together.
When deleting a db file, all db related files has to be deleted together
like journal, wal, shm etc.

Change-Id: I49d4581673d03fe669e9e0eaa2b50f7b9d3c34a4
Signed-off-by: jangwon.lee <jangwon.lee@lge.com>
2013-08-07 09:50:43 +09:00
Ben Gruver
57e76b405f Add the inadvertently missing SCHEME string value provider
Change-Id: I70ce104efac23c3776596571e48ee195be958373
2013-08-06 17:25:27 -07:00
Brian Williammee
1ed51627d9 Track latency of captive portal checks
When captive portal check occurs, track its latency, whether or not
we received a response, and whether or not the response was a captive
portal.  Pair with information identifying the access point / base
station, and broadcast it (with a system|signature-protected
permission).

Broadcast only occurs if user has consented to
Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE.

Change-Id: I6fd59954a7ee2cc7acedf064a1465882653b2173
2013-08-06 16:32:44 -07:00
Amith Yamasani
40f5b63bd9 Merge "Use more styles for preferences to allow single pane 10"" 2013-08-06 23:21:24 +00:00
Martijn Coenen
d9b67633f6 Merge "NFC: @hide some APIs, add setDefaultForNextTap API." 2013-08-06 22:46:48 +00:00
Jean-Michel Trivi
b5edb0bd60 Merge "Event handler should be private in MediaFocusControl" 2013-08-06 22:37:45 +00:00
Martijn Coenen
d40f43c125 NFC: @hide some APIs, add setDefaultForNextTap API.
Change-Id: I31efe4c96a62e6c3dcb984a885214e6df045c6c6
2013-08-06 15:36:37 -07:00
Scott Main
ef54f611c1 am bdf85de3: am 7b60431b: update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug: 10207619
* commit 'bdf85de3b81586aadce564cf9cad6f4c725a302e':
  update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug: 10207619
2013-08-06 15:35:20 -07:00