Commit Graph

30171 Commits

Author SHA1 Message Date
Satoshi Kataoka
65ea41541b Merge "Fix an issue where "SuggestionSpan"s are not removed properly" 2013-06-07 07:59:44 +00:00
Chong Zhang
799d4af8cf Merge "wifi-display: set display to unavailable if p2p device is unavailable" 2013-06-07 03:28:11 +00:00
Svetoslav
494cb689d0 Merge "Optimizing AccessibilityNodeInfo caching." 2013-06-07 00:04:57 +00:00
Chong Zhang
21f603996e wifi-display: set display to unavailable if p2p device is unavailable
Bug 9229799

Change-Id: I680015943f40cded45645dfa0eae42bbce5ce9a3
2013-06-06 15:49:16 -07:00
Jeff Sharkey
7a1c3fce47 Accumulate network statistics based on deltas.
Network stats are now read out of the kernel in one sweep, instead of
reading per-UID.  We now accumulate the delta traffic between each
stats snapshot using the well-tested SamplingCounter pattern.

Since Wi-Fi and mobile traffic have different costs, track each
separately.  Avoids counting misc interfaces like loopback and
ethernet under total.

Bug: 5543387
Change-Id: I642004dc530113c27ef79f2abbae51d8af30117f
2013-06-06 14:35:34 -07:00
Romain Guy
c840a13342 Merge "Remove unnecessary allocations" 2013-06-06 21:02:35 +00:00
Chris Wren
29ee561d2d Merge "reveal the notification extras" 2013-06-06 19:51:47 +00:00
Trevor Johns
a699da6f19 Merge "docs: Fix minor typo in android.content.SyncResult" 2013-06-06 19:49:28 +00:00
Chris Wren
da76ad2ea3 reveal the notification extras
Change-Id: Ic97e3485dc23eeb5cfb565a5cef98489acdec8a2
2013-06-06 15:34:21 -04:00
Romain Guy
f69913056b Remove unnecessary allocations
Change-Id: Ia561a0a312ca2737d5afa742184f5392bb2f29a3
2013-06-06 12:10:42 -07:00
Chet Haase
e2b66ff085 Merge "Fix CrossFade transition" 2013-06-06 17:37:10 +00:00
Chet Haase
71ce4876e5 Merge "Fix crash with LayoutTransition and ViewOverlay collision" 2013-06-06 17:35:24 +00:00
Craig Mautner
d0d3ca9548 Merge "Replace arrays with ArrayList" 2013-06-06 15:33:03 +00:00
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
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
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
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
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
John Spurlock
894e1d9914 Merge "Unhide MotionEvent#actionToString." 2013-06-05 19:50:48 +00:00
Winson Chung
5dd75a35ee am 18748035: am 379517b0: Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)" into jb-mr2-dev
* commit '18748035bbced3b6246b802ab07ee58859a29b0c':
  Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)
2013-06-05 11:50:47 -07:00
Winson Chung
18748035bb am 379517b0: Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)" into jb-mr2-dev
* commit '379517b0d4d47b45b52b40f09ba0eb1a039cb773':
  Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)
2013-06-05 11:47:45 -07:00
Winson Chung
379517b0d4 Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)" into jb-mr2-dev 2013-06-05 18:45:41 +00:00
Alan Viverette
d6f37d724d Merge "Prevent scroll views from sending duplicate onScrollChanged events." 2013-06-05 17:37:29 +00:00
John Spurlock
4dad6cab64 Unhide MotionEvent#actionToString.
Also clarify the input as unmasked, and fix a few other found doc
issues in related methods.

Change-Id: I1338a17dea0282b99229925dea8e48693e177eaa
2013-06-05 13:25:28 -04:00
Przemyslaw Szczepaniak
653278341d Allow TTS service to identify caller.
Added new field (+setter and getter) to SynthesisRequest with
Uid of a calling process. TTS service will be able to discover
packages names associated with caller using
PackageManager.getPackagesForUid.

This will allow to block buggy or poorly designed programs from
an unintentional DDoS attacks against TTS service.

Bug: 8625440
Change-Id: I5ac0ea191f952495c00301f17efdf28205353ae4
2013-06-05 14:44:52 +00:00
Satoshi Kataoka
d7429c15e6 Fix an issue where "SuggestionSpan"s are not removed properly
Basically, the root cause of this issue is a lack of an expected implementation.
This change completes the spec of the architecture to remove modified "SuggestionSpan"s.

Bug: 9190860
Change-Id: I63f2ccf3407ae7c1bc28813e044b8703e2112f34
2013-06-05 22:30:54 +09:00
Chet Haase
83ad439c5e Merge "Fix in transition canceling logic" 2013-06-04 23:37:05 +00:00
Chet Haase
25a738fb25 Fix in transition canceling logic
The logic that canceled underlying animations caused a problem
when there were more than one animation in the list (due to removing
items from a list that was currently being processed elsewhere).

Change-Id: Ie207f340b5d7de4ffcf56a26c05ec394abb80224
2013-06-04 16:35:14 -07:00
Alan Viverette
4bb52a93e9 Merge "Always draw dividers for footers and headers when explicitly enabled." 2013-06-04 22:48:20 +00:00
Alan Viverette
9234a78be2 Merge "Clear pressed state when moving outside list bounds." 2013-06-04 22:46:31 +00:00
Chet Haase
972cfadbe7 Merge "Use ArrayMap instead of HashMap in transitions" 2013-06-04 21:35:04 +00:00
Chet Haase
8be0b88240 Merge "Optimize calls to Trace for animators" 2013-06-04 21:28:40 +00:00
Winson Chung
eeb4ff4d13 Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)
Change-Id: I6cfb8e0c586fad7360a07f98e1280a954f62e5e1
2013-06-04 14:25:28 -07:00
Joe Malin
e3b8d7fdb1 am 36d0f946: am e9dff008: am 305cf97b: am 60776093: am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '36d0f946adc83a9ffa5483556d263b719977da5d':
  DOC CHANGE: Clarify textIsSelectable in TextView
2013-06-04 11:17:16 -07:00
Chet Haase
08735185f8 Use ArrayMap instead of HashMap in transitions
The new ArrayMap class is more efficient for small collections.
Transitions use maps all over the place to collect/use property
values in setting up the transition animations. Changing to ArrayMap
should be more efficient, especially in terms of memory allocations
and GCs.

Issue #9276256 Transitions: Reduce memory allocations

Change-Id: I07b7d4ba68d5a207808eca11943aa3578fa90e3e
2013-06-04 10:44:40 -07:00
Joe Malin
36d0f946ad am e9dff008: am 305cf97b: am 60776093: am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit 'e9dff008adc7b6e565402ec61cd89fb3265a28bd':
  DOC CHANGE: Clarify textIsSelectable in TextView
2013-06-04 10:20:15 -07:00
Joe Malin
e9dff008ad am 305cf97b: am 60776093: am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '305cf97ba7b927f49d3f52952c36cb5102699cc5':
  DOC CHANGE: Clarify textIsSelectable in TextView
2013-06-04 10:17:46 -07:00
Joe Malin
305cf97ba7 am 60776093: am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '60776093a5569817040e2f65a17893a381906564':
  DOC CHANGE: Clarify textIsSelectable in TextView
2013-06-04 10:14:48 -07:00
Joe Malin
60776093a5 am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '029099ff56b92201e10b2047e1ced675c8e9f964':
  DOC CHANGE: Clarify textIsSelectable in TextView
2013-06-04 10:12:09 -07:00