107924 Commits

Author SHA1 Message Date
Craig Mautner
8306f87132 Merge "Delay removal of windows from WindowManager" 2013-06-06 15:31:32 +00:00
Craig Mautner
652fdfaf6f Replace arrays with ArrayList
The three arrays were being reconstructed and copied for each add
and each remove. By replacing them with ArrayList only three
constructions total are required. Also, the number of
System.arraycopy() calls is halved.

Change-Id: I0f8def1b517eb1bc5f930fcd5d3d1e0394071f0e

Conflicts:
	core/java/android/view/WindowManagerGlobal.java
2013-06-06 07:51:57 -07:00
Chet Haase
4f0c4672ac Fix CrossFade transition
Small fixes in CrossFade to handle more general situations.
Also, added API to CrossFade to enable different behaviors during
the transition.

Change-Id: I12d17ab8f8f96be370c070373112ad8a62df9115
2013-06-06 07:37:32 -07:00
Craig Mautner
05eb730ca4 Delay removal of windows from WindowManager
When relaunching activities the window manager clears out all windows
by calling a ViewRootImpl.die() in a deferred fashion. Then it
immediately deletes the ViewRootImpl and its view from its list
of windows. When the die() is eventually executed it calls
dispatchDetachedFromWindow() which tries to remove the previously
removed windows causing an Exception to be thrown.

This change waits to remove the windows until after die() has been
completed. Fixes bug 8253030.

Change-Id: I5b41be1c6b776e32128c064267653db98bd95292
2013-06-06 07:32:13 -07:00
Chet Haase
ce08ce539a Fix crash with LayoutTransition and ViewOverlay collision
When a View is added to a ViewGroupOverlay, it must not be parented
in another container. If it is, it will automatically be removed.
This works in general, but if there is a LayoutTransition on the
view's parent, then the actual removal will be delayed until the
transition completes. This means that the call to add(view) in
the ViewGroupOverlay's container will fail and throw an exception because
the view is still parented for the duration of the LayoutTransition.

This fix cancels the running transition to ensure that the view is not
parented prior to adding it to the overlay's container.

Issue #9303245 Crash combo: add(View) and animateLayoutChanges

Change-Id: Id4eaddccf64c353fc77e020882b978cdeb14c0ef
2013-06-06 07:27:53 -07:00
John Spurlock
b8bacccfc1 Remove a few non-public dependencies.
Maps, CharSequences, MotionEvent.copy

Change-Id: I97e15b0f9530623f65e061674bd7ec56d8fefa3e
2013-06-06 09:34:35 -04:00
The Android Automerger
11dc1b3686 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-06 05:55:33 -07:00
Ken Sumrall
025adc4457 Don't wait for the MountService to be ready when encrypting
The MountService will take 2 minutes to time out trying to
get volume and asec lists from vold, because vold is busy encrypting
and not listening to requests on its socket.  So when encrypting,
do not wait for it to be ready, as we don't have /data mounted anyhow.

Change-Id: I45c1067b168231cbec7a0f577de2ff3b28dbac55
2013-06-05 22:08:12 -07:00
Trevor Johns
05d60beb89 docs: Fix minor typo in android.content.SyncResult
Change "storage later" to "storage layer" in docs for
SyncResult.databaseError.

Change-Id: I5fa07c2e58c65dbe00b1341f0cca99d47d2dd264
2013-06-05 19:23:50 -07:00
kmccormick
ae8f82f201 am cdd271d4: am 38bdf107: am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit 'cdd271d421136593553e3c32aa4b98fc4f5268f3':
  Doc update: Refactoring to client/server.
2013-06-05 18:36:38 -07:00
kmccormick
cdd271d421 am 38bdf107: am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '38bdf107ba0abcce8b87bc87653c73191566d002':
  Doc update: Refactoring to client/server.
2013-06-05 18:33:38 -07:00
kmccormick
38bdf107ba am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '57394e3daff094c28ee2a2fb886e1764a1b7728d':
  Doc update: Refactoring to client/server.
2013-06-05 18:32:23 -07:00
kmccormick
57394e3daf am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '2fbe109466ba582663fdc0f98ff4b9aeeb15ce32':
  Doc update: Refactoring to client/server.
2013-06-05 18:30:19 -07:00
kmccormick
2fbe109466 am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '3ef445a80aea4670855f4cabe8072f16c1ff5128':
  Doc update: Refactoring to client/server.
2013-06-05 18:27:50 -07:00
kmccormick
3ef445a80a am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '68291f33e03be5180dc5c921d71cafbc83507301':
  Doc update: Refactoring to client/server.
2013-06-05 18:26:16 -07:00
kmccormick
68291f33e0 am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit 'db3158ead35f28ea31a7b6d87c50108cf972a9c0':
  Doc update: Refactoring to client/server.
2013-06-05 18:25:12 -07:00
kmccormick
db3158ead3 Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 2013-06-06 01:22:55 +00:00
kmccormick
f788ac1ab1 Doc update: Refactoring to client/server.
Change-Id: I14e958958e69a6a56d2cc6da70b9123febd9955b
2013-06-05 18:01:06 -07:00
Craig Mautner
fb7044598b Merge "Extend stacks up under status bar" 2013-06-06 00:28:20 +00:00
Craig Mautner
c5a6e44f59 Extend stacks up under status bar
Retain compatibility with earlier behavior. Fixes bug 8685941.

Change-Id: Ida800a2476ba3a18cd97deccbc65c8a02739d118
2013-06-05 17:22:35 -07:00
Alan Viverette
7214643332 Deprecate DrawableStateList.getChildren() and add getChild().
Moves from exposing the internal structure of a drawable state list
to only exposing the data. Adds getCapacity() and mutate() as
package-private APIs to support various drawable subclasses.

Change-Id: Id08743f979287e1a305f069ccc3c0085a7da6f7b
2013-06-05 17:12:19 -07:00
Elliott Hughes
e7af0d2866 am 340df6c4: am 4d33a8ab: am fa6d6256: Merge "change "next" to "done" in minute IME option under 24-hour format"
* commit '340df6c4f7af79dc085471064211ba01ebd45f0a':
  change "next" to "done" in minute IME option under 24-hour format
2013-06-05 16:29:13 -07:00
Elliott Hughes
340df6c4f7 am 4d33a8ab: am fa6d6256: Merge "change "next" to "done" in minute IME option under 24-hour format"
* commit '4d33a8aba33fa70e1e1a1c713e487a26a090bc25':
  change "next" to "done" in minute IME option under 24-hour format
2013-06-05 16:26:04 -07:00
Elliott Hughes
4d33a8aba3 am fa6d6256: Merge "change "next" to "done" in minute IME option under 24-hour format"
* commit 'fa6d6256e9052a5f5155ac97364170f6518e37a4':
  change "next" to "done" in minute IME option under 24-hour format
2013-06-05 16:23:34 -07:00
Elliott Hughes
fa6d6256e9 Merge "change "next" to "done" in minute IME option under 24-hour format" 2013-06-05 23:20:37 +00:00
Chris Craik
905e8246ef Add support for post-decode density scaling with reuse
Also, simplifies scaling path, removing java variant - we always do
the scaling in native, which has the benefit of avoiding non-native
temporary allocations

Change-Id: I39c2219f5d77a267719629704e65611cf4388a82
2013-06-05 16:09:31 -07:00
Dianne Hackborn
d270028c10 Maybe fix issue #9296868: Crash in system process
There were some paths in LocationManagerService where
mRecivers was being accessed/modified without the lock held.
Update method names to indicate they need to be called with
lock held to make it more clear in the future when such a
problem may happen.

Change-Id: Ie2a9d019155ac7cedd1db298caca75b8fe382ca7
2013-06-05 15:39:13 -07:00
Jeff Brown
5087b7f27c Fix regression in long-press home behavior on tablets.
Some config.xml resources have values that vary based on the
configuration.  A previous change caused initialization to
occur at a time when the configuration is was not yet available.
This change fixes the problem.

Bug: 8891502
Change-Id: Ia768dc2308cc6ae5f11812c6bce6a6e116cfd759
2013-06-05 15:39:07 -07:00
Baligh Uddin
3f77c59688 Import translations. DO NOT MERGE
Change-Id: I9a9d3071332508b3efbb0bed4eeb435cdc5ba3d9
Auto-generated-cl: translation import
2013-06-05 15:39:00 -07:00
Jeff Sharkey
85eae9c1aa Create missing Uids when recording network stats.
Bug: 5543387
Change-Id: I138c8d2f84e6fd737f2f6ef0945e75ca31256e3d
2013-06-05 15:38:53 -07:00
Dianne Hackborn
fa52a4aa31 am a79aaeae: am 8c1d1b3e: Merge "Maybe fix issue #9296868: Crash in system process" into jb-mr2-dev
* commit 'a79aaeae551b6ae9d94437505d88bfe3f1bf56ec':
  Maybe fix issue #9296868: Crash in system process
2013-06-05 15:19:17 -07:00
Dianne Hackborn
a79aaeae55 am 8c1d1b3e: Merge "Maybe fix issue #9296868: Crash in system process" into jb-mr2-dev
* commit '8c1d1b3edff299ca6ef5739e044343b7f2c57f73':
  Maybe fix issue #9296868: Crash in system process
2013-06-05 15:17:26 -07:00
Svetoslav
6254f4806d Optimizing AccessibilityNodeInfo caching.
1. Before we were firing an accessibility event from the common
   predecessor of views with accessibility related state changes
   every X amount of time. These events designate that the tree
   rooted at the source is invalid and should not be cached.
   However, some of the state changes do not affect the view tree
   structure and we can just refresh the node instead of evicting
   and recaching nodes infos for views that did not change. Hence,
   we need a way to distinguish between a subtree changed over a
   node changed.

   Adding a new event type will not work since if say two siblings
   have local changes and their predecessor fires a window state
   change event, the client will drop the subtree rooted at the
   parent including the two views with changes. Subsequent, more
   specialized events emitted from the two changed siblings will
   be useless since the parent which did not changed is already
   evicted from the cache. Conversely, if the specialized events
   are fired from the two siblings with local changes and they
   are refreshed in the cache the subsequent window state change
   event from the common predecessor will force the refreshed
   nodes to be evicted.

   Hence, to enable distinction between node being changed and
   a subtree baing changed while not changing existing behavior,
   we will fire only window content change event with an additional
   argument specifying what changed - node or a subtree for now.
   Also if the changes are local to a view we fire the window
   content changed event from the view. So, the two siblings will
   fire such an event independently and the client will know that
   these are local changes and can just refresh the node. If the
   changes are structural, then we fire the window state change
   event from the common predecessor.

2. Added the input type of a text view as one of the properties
   reported by an AccessibilityNodeInfo. It is nice to prompt the
   user what input is expected.

3. Added a bundle for optional information to AccessiiblityNodeInfo.
   For example, it will be used for putting web specific properties
   that do not map cleanly to Android specific ones in WebView.

4. AccessibilityInteractionController was not taking into account
   whether the current accessibility focused node is shown before
   returing it. Hence, a disconnected node would be returned and
   caching it puts our cahche in an inconsistent state.

Change-Id: I8ed19cfb4a70bdd7597c3f105487f1651cffd9e0
2013-06-05 15:16:05 -07:00
Dianne Hackborn
8c1d1b3edf Merge "Maybe fix issue #9296868: Crash in system process" into jb-mr2-dev 2013-06-05 22:14:39 +00:00
Jeff Brown
16f6b1514d am b093ea59: am f8038bdd: Merge "Fix regression in long-press home behavior on tablets." into jb-mr2-dev
* commit 'b093ea59fec05d3644a8dfbeda90c635f04a88fc':
  Fix regression in long-press home behavior on tablets.
2013-06-05 15:06:20 -07:00
Jeff Brown
b093ea59fe am f8038bdd: Merge "Fix regression in long-press home behavior on tablets." into jb-mr2-dev
* commit 'f8038bddcea53d8dfe98e17c5d996b52a8eb5c4e':
  Fix regression in long-press home behavior on tablets.
2013-06-05 15:03:25 -07:00
Jeff Brown
f8038bddce Merge "Fix regression in long-press home behavior on tablets." into jb-mr2-dev 2013-06-05 22:00:58 +00:00
Dianne Hackborn
f5fdca9dc1 Maybe fix issue #9296868: Crash in system process
There were some paths in LocationManagerService where
mRecivers was being accessed/modified without the lock held.
Update method names to indicate they need to be called with
lock held to make it more clear in the future when such a
problem may happen.

Change-Id: Ie2a9d019155ac7cedd1db298caca75b8fe382ca7
2013-06-05 14:53:33 -07:00
Scott Main
436a1c651a am 63fcfd5a: am 06543a45: small cleanup of trigger event javadoc
* commit '63fcfd5a52090542e5da601336f712ee64e61d8a':
  small cleanup of trigger event javadoc
2013-06-05 14:44:20 -07:00
Scott Main
63fcfd5a52 am 06543a45: small cleanup of trigger event javadoc
* commit '06543a4559b34abf91e34cb44438683e77e7db36':
  small cleanup of trigger event javadoc
2013-06-05 14:41:51 -07:00
Scott Main
06543a4559 small cleanup of trigger event javadoc
Change-Id: Ib8a0fc0a7ddac6259cc1bb9e8701b0d570a101c6
2013-06-05 14:29:50 -07:00
Romain Guy
ba23e80b80 Merge "Remove string allocations when creating display lists" 2013-06-05 21:15:03 +00:00
Romain Guy
450dc7554d Remove string allocations when creating display lists
Change-Id: Id520db981a3988cb980c8da5dbea8f26ef94989f
2013-06-05 14:14:03 -07:00
Tim Murray
91715029ea am 92b1bd5e: am 47c892e5: Merge "Update RenderScript API guide." into jb-mr2-dev
* commit '92b1bd5e6af0852c5be76b2e0f9cd5869c020b69':
  Update RenderScript API guide.
2013-06-05 13:53:31 -07:00
Tim Murray
3f4579fbe4 am 379641a7: am ea45ab6f: Merge "Improve RS documentation." into jb-mr2-dev
* commit '379641a7ef09e1d7fab34d3027c5809fb2bc21ad':
  Improve RS documentation.
2013-06-05 13:53:28 -07:00
Tim Murray
92b1bd5e6a am 47c892e5: Merge "Update RenderScript API guide." into jb-mr2-dev
* commit '47c892e5b0224f7088202ecd1ef469556ed29209':
  Update RenderScript API guide.
2013-06-05 13:46:59 -07:00
Tim Murray
379641a7ef am ea45ab6f: Merge "Improve RS documentation." into jb-mr2-dev
* commit 'ea45ab6fbc1e45727b08cea0c865f4302a494412':
  Improve RS documentation.
2013-06-05 13:46:56 -07:00
Tim Murray
47c892e5b0 Merge "Update RenderScript API guide." into jb-mr2-dev 2013-06-05 20:45:00 +00:00
Tim Murray
ea45ab6fbc Merge "Improve RS documentation." into jb-mr2-dev 2013-06-05 20:44:36 +00:00
Joe Malin
5b4438ebb3 Doc bug B9297954: Fixes to Location APIs
Change-Id: I6c496fb46e0b35f3ee2be83369326ebf7be1a874
2013-06-05 13:16:39 -07:00