OSDN Git Service
John Spurlock [Thu, 6 Jun 2013 18:00:30 +0000 (18:00 +0000)]
Merge "Remove a few non-public dependencies."
Joe Malin [Thu, 6 Jun 2013 17:55:44 +0000 (10:55 -0700)]
am
7b34346d: am
a2425f68: Merge "Doc bug
B9297954: Fixes to Location APIs" into jb-mr2-dev
* commit '
7b34346d483f41c1a7b444299903017c9d69eb6d':
Doc bug
B9297954: Fixes to Location APIs
Joe Malin [Thu, 6 Jun 2013 17:53:36 +0000 (10:53 -0700)]
am
a2425f68: Merge "Doc bug
B9297954: Fixes to Location APIs" into jb-mr2-dev
* commit '
a2425f6825a88fb04f3a22e018311bf2e2a5ac4e':
Doc bug
B9297954: Fixes to Location APIs
Dirk Dougherty [Thu, 6 Jun 2013 17:51:57 +0000 (10:51 -0700)]
am
36631b44: am
758cedd1: am
f1469855: am
86927797: am
cf35c5e3: am
497584ed: am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
36631b44f27af76e1fbd3def4b50b2cad9db0ecf':
Doc change: fix broken link to localization checklist.
Dirk Dougherty [Thu, 6 Jun 2013 17:50:04 +0000 (10:50 -0700)]
am
758cedd1: am
f1469855: am
86927797: am
cf35c5e3: am
497584ed: am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
758cedd116f1c6ea4b8b936a76cd77d592868209':
Doc change: fix broken link to localization checklist.
Joe Malin [Thu, 6 Jun 2013 17:49:27 +0000 (17:49 +0000)]
Merge "Doc bug
B9297954: Fixes to Location APIs" into jb-mr2-dev
Dirk Dougherty [Thu, 6 Jun 2013 17:47:34 +0000 (10:47 -0700)]
am
f1469855: am
86927797: am
cf35c5e3: am
497584ed: am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
f14698551aeb57dc1952413480cb72a0c8ffb620':
Doc change: fix broken link to localization checklist.
Dirk Dougherty [Thu, 6 Jun 2013 17:46:14 +0000 (10:46 -0700)]
am
86927797: am
cf35c5e3: am
497584ed: am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
86927797869512f87e0ba6be5b83564e4a773b71':
Doc change: fix broken link to localization checklist.
Dirk Dougherty [Thu, 6 Jun 2013 17:43:34 +0000 (10:43 -0700)]
am
cf35c5e3: am
497584ed: am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
cf35c5e35d15f9ced64e739bd216dae7d0cbd8ae':
Doc change: fix broken link to localization checklist.
Dirk Dougherty [Thu, 6 Jun 2013 17:41:45 +0000 (10:41 -0700)]
am
497584ed: am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
497584edbacb15b174901da21bc94f37528ac7d1':
Doc change: fix broken link to localization checklist.
Dirk Dougherty [Thu, 6 Jun 2013 17:39:22 +0000 (10:39 -0700)]
am
16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '
16fdbd1729e9473f6176c88c59538fc5c371154f':
Doc change: fix broken link to localization checklist.
The Android Open Source Project [Thu, 6 Jun 2013 17:38:59 +0000 (10:38 -0700)]
am
3fbf896c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
3fbf896c1f194c37bb49d753d7f30367a9a9c43f':
Maybe fix issue #
9296868: Crash in system process
Fix regression in long-press home behavior on tablets.
Import translations. DO NOT MERGE
Create missing Uids when recording network stats.
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 6 Jun 2013 17:37:18 +0000 (10:37 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I7ad4d9cdf2b0e666af7ac5791eb357703900969c
Chet Haase [Thu, 6 Jun 2013 17:37:10 +0000 (17:37 +0000)]
Merge "Fix CrossFade transition"
Alan Viverette [Thu, 6 Jun 2013 17:36:39 +0000 (17:36 +0000)]
Merge "Deprecate DrawableStateList.getChildren() and add getChild()."
Dirk Dougherty [Thu, 6 Jun 2013 17:36:29 +0000 (17:36 +0000)]
Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
Chet Haase [Thu, 6 Jun 2013 17:35:23 +0000 (17:35 +0000)]
Merge "Fix crash with LayoutTransition and ViewOverlay collision"
Dirk Dougherty [Thu, 6 Jun 2013 17:34:40 +0000 (10:34 -0700)]
Doc change: fix broken link to localization checklist.
Change-Id: I95bb57dcc0afe4ed31f89d9d2e9b31b1a7224bc7
Chris Craik [Thu, 6 Jun 2013 16:13:29 +0000 (16:13 +0000)]
Merge "Support all formats for BitmapFactory.Options.inBitmap"
Craig Mautner [Thu, 6 Jun 2013 15:33:02 +0000 (15:33 +0000)]
Merge "Replace arrays with ArrayList"
Craig Mautner [Thu, 6 Jun 2013 15:31:32 +0000 (15:31 +0000)]
Merge "Delay removal of windows from WindowManager"
Craig Mautner [Thu, 6 Jun 2013 14:51:57 +0000 (07:51 -0700)]
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
Chet Haase [Thu, 6 Jun 2013 00:49:01 +0000 (17:49 -0700)]
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
Craig Mautner [Tue, 4 Jun 2013 00:24:21 +0000 (17:24 -0700)]
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
Chet Haase [Thu, 6 Jun 2013 14:27:53 +0000 (07:27 -0700)]
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
John Spurlock [Wed, 5 Jun 2013 16:59:01 +0000 (12:59 -0400)]
Remove a few non-public dependencies.
Maps, CharSequences, MotionEvent.copy
Change-Id: I97e15b0f9530623f65e061674bd7ec56d8fefa3e
The Android Automerger [Thu, 6 Jun 2013 12:55:33 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
kmccormick [Thu, 6 Jun 2013 01:36:38 +0000 (18:36 -0700)]
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.
kmccormick [Thu, 6 Jun 2013 01:33:38 +0000 (18:33 -0700)]
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.
kmccormick [Thu, 6 Jun 2013 01:32:23 +0000 (18:32 -0700)]
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.
kmccormick [Thu, 6 Jun 2013 01:30:19 +0000 (18:30 -0700)]
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.
kmccormick [Thu, 6 Jun 2013 01:27:50 +0000 (18:27 -0700)]
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.
kmccormick [Thu, 6 Jun 2013 01:26:16 +0000 (18:26 -0700)]
am
68291f33: am
db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '
68291f33e03be5180dc5c921d71cafbc83507301':
Doc update: Refactoring to client/server.
kmccormick [Thu, 6 Jun 2013 01:25:12 +0000 (18:25 -0700)]
am
db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '
db3158ead35f28ea31a7b6d87c50108cf972a9c0':
Doc update: Refactoring to client/server.
kmccormick [Thu, 6 Jun 2013 01:22:54 +0000 (01:22 +0000)]
Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
kmccormick [Fri, 31 May 2013 02:06:41 +0000 (19:06 -0700)]
Doc update: Refactoring to client/server.
Change-Id: I14e958958e69a6a56d2cc6da70b9123febd9955b
Craig Mautner [Thu, 6 Jun 2013 00:28:19 +0000 (00:28 +0000)]
Merge "Extend stacks up under status bar"
Craig Mautner [Thu, 6 Jun 2013 00:22:35 +0000 (17:22 -0700)]
Extend stacks up under status bar
Retain compatibility with earlier behavior. Fixes bug
8685941.
Change-Id: Ida800a2476ba3a18cd97deccbc65c8a02739d118
Alan Viverette [Thu, 6 Jun 2013 00:12:19 +0000 (17:12 -0700)]
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
Elliott Hughes [Wed, 5 Jun 2013 23:29:13 +0000 (16:29 -0700)]
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
Elliott Hughes [Wed, 5 Jun 2013 23:26:04 +0000 (16:26 -0700)]
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
Elliott Hughes [Wed, 5 Jun 2013 23:23:34 +0000 (16:23 -0700)]
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
Elliott Hughes [Wed, 5 Jun 2013 23:20:37 +0000 (23:20 +0000)]
Merge "change "next" to "done" in minute IME option under 24-hour format"
Dianne Hackborn [Wed, 5 Jun 2013 21:53:33 +0000 (14:53 -0700)]
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
Jeff Brown [Sat, 1 Jun 2013 00:59:11 +0000 (17:59 -0700)]
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
Baligh Uddin [Tue, 4 Jun 2013 22:40:50 +0000 (15:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a9d3071332508b3efbb0bed4eeb435cdc5ba3d9
Auto-generated-cl: translation import
Jeff Sharkey [Tue, 4 Jun 2013 21:09:31 +0000 (14:09 -0700)]
Create missing Uids when recording network stats.
Bug:
5543387
Change-Id: I138c8d2f84e6fd737f2f6ef0945e75ca31256e3d
Dianne Hackborn [Wed, 5 Jun 2013 22:19:17 +0000 (15:19 -0700)]
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
Dianne Hackborn [Wed, 5 Jun 2013 22:17:26 +0000 (15:17 -0700)]
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
Dianne Hackborn [Wed, 5 Jun 2013 22:14:38 +0000 (22:14 +0000)]
Merge "Maybe fix issue #
9296868: Crash in system process" into jb-mr2-dev
Jeff Brown [Wed, 5 Jun 2013 22:06:20 +0000 (15:06 -0700)]
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.
Jeff Brown [Wed, 5 Jun 2013 22:03:25 +0000 (15:03 -0700)]
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.
Jeff Brown [Wed, 5 Jun 2013 22:00:58 +0000 (22:00 +0000)]
Merge "Fix regression in long-press home behavior on tablets." into jb-mr2-dev
Dianne Hackborn [Wed, 5 Jun 2013 21:53:33 +0000 (14:53 -0700)]
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
Scott Main [Wed, 5 Jun 2013 21:44:20 +0000 (14:44 -0700)]
am
63fcfd5a: am
06543a45: small cleanup of trigger event javadoc
* commit '
63fcfd5a52090542e5da601336f712ee64e61d8a':
small cleanup of trigger event javadoc
Scott Main [Wed, 5 Jun 2013 21:41:51 +0000 (14:41 -0700)]
am
06543a45: small cleanup of trigger event javadoc
* commit '
06543a4559b34abf91e34cb44438683e77e7db36':
small cleanup of trigger event javadoc
Scott Main [Wed, 5 Jun 2013 21:29:50 +0000 (14:29 -0700)]
small cleanup of trigger event javadoc
Change-Id: Ib8a0fc0a7ddac6259cc1bb9e8701b0d570a101c6
Romain Guy [Wed, 5 Jun 2013 21:15:03 +0000 (21:15 +0000)]
Merge "Remove string allocations when creating display lists"
Romain Guy [Wed, 5 Jun 2013 21:14:03 +0000 (14:14 -0700)]
Remove string allocations when creating display lists
Change-Id: Id520db981a3988cb980c8da5dbea8f26ef94989f
Tim Murray [Wed, 5 Jun 2013 20:53:31 +0000 (13:53 -0700)]
am
92b1bd5e: am
47c892e5: Merge "Update RenderScript API guide." into jb-mr2-dev
* commit '
92b1bd5e6af0852c5be76b2e0f9cd5869c020b69':
Update RenderScript API guide.
Tim Murray [Wed, 5 Jun 2013 20:53:28 +0000 (13:53 -0700)]
am
379641a7: am
ea45ab6f: Merge "Improve RS documentation." into jb-mr2-dev
* commit '
379641a7ef09e1d7fab34d3027c5809fb2bc21ad':
Improve RS documentation.
Tim Murray [Wed, 5 Jun 2013 20:46:59 +0000 (13:46 -0700)]
am
47c892e5: Merge "Update RenderScript API guide." into jb-mr2-dev
* commit '
47c892e5b0224f7088202ecd1ef469556ed29209':
Update RenderScript API guide.
Tim Murray [Wed, 5 Jun 2013 20:46:56 +0000 (13:46 -0700)]
am
ea45ab6f: Merge "Improve RS documentation." into jb-mr2-dev
* commit '
ea45ab6fbc1e45727b08cea0c865f4302a494412':
Improve RS documentation.
Tim Murray [Wed, 5 Jun 2013 20:45:00 +0000 (20:45 +0000)]
Merge "Update RenderScript API guide." into jb-mr2-dev
Tim Murray [Wed, 5 Jun 2013 20:44:36 +0000 (20:44 +0000)]
Merge "Improve RS documentation." into jb-mr2-dev
Joe Malin [Wed, 5 Jun 2013 20:16:39 +0000 (13:16 -0700)]
Doc bug
B9297954: Fixes to Location APIs
Change-Id: I6c496fb46e0b35f3ee2be83369326ebf7be1a874
John Spurlock [Wed, 5 Jun 2013 19:50:48 +0000 (19:50 +0000)]
Merge "Unhide MotionEvent#actionToString."
Winson Chung [Wed, 5 Jun 2013 18:50:47 +0000 (11:50 -0700)]
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)
Winson Chung [Wed, 5 Jun 2013 18:47:45 +0000 (11:47 -0700)]
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)
Winson Chung [Wed, 5 Jun 2013 18:45:41 +0000 (18:45 +0000)]
Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug
9270309)" into jb-mr2-dev
Tim Murray [Thu, 30 May 2013 19:34:40 +0000 (12:34 -0700)]
Update RenderScript API guide.
bug
8570568
Change-Id: Ib49a63f15ce421115179764a14597b2746a1f2e7
Tim Murray [Tue, 9 Apr 2013 18:01:01 +0000 (11:01 -0700)]
Improve RS documentation.
bug
8570568
Change-Id: I465fcc8ec3e2cc892dc3cb0067aacf5224338102
Alan Viverette [Wed, 5 Jun 2013 17:37:28 +0000 (17:37 +0000)]
Merge "Prevent scroll views from sending duplicate onScrollChanged events."
Romain Guy [Wed, 5 Jun 2013 17:35:30 +0000 (17:35 +0000)]
Merge "Introduce Caches::bindTexture() to reduce glBindTexture calls"
John Spurlock [Wed, 5 Jun 2013 17:17:05 +0000 (13:17 -0400)]
Unhide MotionEvent#actionToString.
Also clarify the input as unmasked, and fix a few other found doc
issues in related methods.
Change-Id: I1338a17dea0282b99229925dea8e48693e177eaa
The Android Automerger [Wed, 5 Jun 2013 17:16:05 +0000 (10:16 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Przemyslaw Szczepaniak [Fri, 31 May 2013 12:12:52 +0000 (13:12 +0100)]
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
Scott Main [Wed, 5 Jun 2013 02:40:25 +0000 (19:40 -0700)]
am
0f34894e: am
aafed1df: add link to required permission from ACTION_RESPOND_VIA_MESSAGE
* commit '
0f34894ed83a20ab4fcf9edb6437b59527ca9585':
add link to required permission from ACTION_RESPOND_VIA_MESSAGE
Scott Main [Wed, 5 Jun 2013 02:38:23 +0000 (19:38 -0700)]
am
aafed1df: add link to required permission from ACTION_RESPOND_VIA_MESSAGE
* commit '
aafed1df0404e2fb64c1adeb127dc7f300a2c07b':
add link to required permission from ACTION_RESPOND_VIA_MESSAGE
Scott Main [Wed, 5 Jun 2013 02:29:24 +0000 (19:29 -0700)]
add link to required permission from ACTION_RESPOND_VIA_MESSAGE
Change-Id: Iafa9c72c9bbd8258c7f961f7ab8ad78c96b61e54
Romain Guy [Wed, 5 Jun 2013 01:00:09 +0000 (18:00 -0700)]
Introduce Caches::bindTexture() to reduce glBindTexture calls
Change-Id: Ic345422567c020c0a9035ff51dcf2ae2a1fc59f4
Jeff Sharkey [Wed, 5 Jun 2013 00:00:19 +0000 (17:00 -0700)]
am
ffbbe945: am
d293d229: Merge "Create missing Uids when recording network stats." into jb-mr2-dev
* commit '
ffbbe945066bf0b295ff65edfb1c49f7a4311718':
Create missing Uids when recording network stats.
Jeff Sharkey [Tue, 4 Jun 2013 23:57:51 +0000 (16:57 -0700)]
am
d293d229: Merge "Create missing Uids when recording network stats." into jb-mr2-dev
* commit '
d293d229493a2d661ebb1776a0915297927a5ca6':
Create missing Uids when recording network stats.
Jeff Sharkey [Tue, 4 Jun 2013 23:55:36 +0000 (23:55 +0000)]
Merge "Create missing Uids when recording network stats." into jb-mr2-dev
Chet Haase [Tue, 4 Jun 2013 23:37:05 +0000 (23:37 +0000)]
Merge "Fix in transition canceling logic"
Chet Haase [Tue, 4 Jun 2013 23:35:14 +0000 (16:35 -0700)]
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
Romain Guy [Tue, 4 Jun 2013 22:54:18 +0000 (22:54 +0000)]
Merge "Enable GPU pixel buffers on OpenGL ES 3.0 devices"
Alan Viverette [Tue, 4 Jun 2013 22:48:20 +0000 (22:48 +0000)]
Merge "Always draw dividers for footers and headers when explicitly enabled."
Baligh Uddin [Tue, 4 Jun 2013 22:47:48 +0000 (15:47 -0700)]
am
ba792ed5: (-s ours) am
2156c386: Import translations. DO NOT MERGE
* commit '
ba792ed5c322a0a7994fa15cd92c2ef50563f079':
Import translations. DO NOT MERGE
Alan Viverette [Tue, 4 Jun 2013 22:46:30 +0000 (22:46 +0000)]
Merge "Clear pressed state when moving outside list bounds."
Baligh Uddin [Tue, 4 Jun 2013 22:45:55 +0000 (15:45 -0700)]
am
2156c386: Import translations. DO NOT MERGE
* commit '
2156c38622f1cd78e9ad8dba27eb6b3fde939b3c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Jun 2013 22:40:50 +0000 (15:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a9d3071332508b3efbb0bed4eeb435cdc5ba3d9
Auto-generated-cl: translation import
Chet Haase [Tue, 4 Jun 2013 21:35:04 +0000 (21:35 +0000)]
Merge "Use ArrayMap instead of HashMap in transitions"
Chet Haase [Tue, 4 Jun 2013 21:28:40 +0000 (21:28 +0000)]
Merge "Optimize calls to Trace for animators"
Winson Chung [Tue, 4 Jun 2013 21:25:28 +0000 (14:25 -0700)]
Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug
9270309)
Change-Id: I6cfb8e0c586fad7360a07f98e1280a954f62e5e1
Jeff Sharkey [Tue, 4 Jun 2013 21:09:31 +0000 (14:09 -0700)]
Create missing Uids when recording network stats.
Bug:
5543387
Change-Id: I138c8d2f84e6fd737f2f6ef0945e75ca31256e3d
Baligh Uddin [Mon, 3 Jun 2013 16:11:49 +0000 (09:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I455b359698e9bf43d7065374241783fa1f06faca
Auto-generated-cl: translation import
Romain Guy [Thu, 9 May 2013 18:50:12 +0000 (11:50 -0700)]
Enable GPU pixel buffers on OpenGL ES 3.0 devices
Change-Id: I164d72ccd7a9bf6ae0e3f79dfef50083558937ba
Joe Malin [Tue, 4 Jun 2013 18:17:16 +0000 (11:17 -0700)]
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
Scott Main [Tue, 4 Jun 2013 18:17:14 +0000 (11:17 -0700)]
am
e125116f: am
e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2-dev
* commit '
e125116fc8767ecf431c80f5659a8a90032acb97':
javadoc cleanup for audioeffect