Craig Mautner
592647ee2e
Merge "Fix IndexOutOfBoundsException."
2012-04-10 14:23:10 -07:00
George Mount
1bee28f4c8
Merge "Revert "Revert "Keep selection handles in edit fields."""
2012-04-10 14:23:07 -07:00
Eric Fischer
cd1c059bbc
Merge "Import translations. DO NOT MERGE"
2012-04-10 14:22:52 -07:00
Jack Palevich
2b39c3126b
Merge "Notify monitor waiters when changing mSurfaceIsBad value."
2012-04-10 14:20:28 -07:00
Jeff Sharkey
cc0ec91307
Merge "Move to Android-specific NTP pool."
2012-04-10 14:01:53 -07:00
Jeff Sharkey
40caf8f443
Move to Android-specific NTP pool.
...
Use "2.android.pool.ntp.org" since it returns both IPv4 and IPv6
addresses. Verified that NTP client works correctly on both.
Change-Id: I0187ef4a6d3b353cfcc77957b1303ca01c67cbe9
2012-04-10 13:48:10 -07:00
George Mount
7102eb2d30
Revert "Revert "Keep selection handles in edit fields.""
...
This reverts commit 90c08eafad72454a31282fd887ec23d357c904a4
2012-04-10 13:41:51 -07:00
Gilles Debunne
ce5f917b54
Merge "Removed exception from SpannableStringBuilder"
2012-04-10 13:36:40 -07:00
Eric Laurent
a219c5eec8
Merge "audio preprocessing: added static factory method"
2012-04-10 13:32:22 -07:00
Gilles Debunne
34ec2b54da
Removed exception from SpannableStringBuilder
...
Bug 6312196
Change-Id: I9cece36b40d8948e0e85bd433954818991009ad5
2012-04-10 13:31:11 -07:00
Robert Ly
621ff7d1a5
docs: fixing ndk bug 5991108
...
Change-Id: I70b5505fc424b278ea8977955857c92082a1f828
2012-04-10 13:30:45 -07:00
Eric Fischer
7866e84fbc
Import translations. DO NOT MERGE
...
Change-Id: I988480b6b1ff1b745b4126ef89ee57b97513d6e2
2012-04-10 13:29:58 -07:00
Robert Ly
41a8c7e68a
docs: fixing broken link for bug 6104366
...
Change-Id: Ic8f7a9c5540cc0dd2251b7373e80b1f9ab6d8aa9
2012-04-10 13:20:44 -07:00
Craig Mautner
93a035cce1
Fix IndexOutOfBoundsException.
...
This fix resolves an exception thrown when the snapshot ArrayList has
no entries.
Fixes bug 6311207.
Change-Id: I84383417116a4a62eb2842792ed04096aebc8ee2
2012-04-10 13:19:35 -07:00
George Mount
f5711ab0fe
Merge "Revert "Keep selection handles in edit fields.""
2012-04-10 13:16:03 -07:00
George Mount
90c08eafad
Revert "Keep selection handles in edit fields."
...
This reverts commit 5d84368a7577c5d53ce885cd2d095cc5ba40d924
2012-04-10 13:14:48 -07:00
Craig Mautner
8330e40b98
Merge "Reduce load on CPU when animating rotation."
2012-04-10 13:01:12 -07:00
Craig Mautner
73850cb699
Reduce load on CPU when animating rotation.
...
This change keeps requestTraversalLocked from being called on virtually
every call to animate while rotating.
Change-Id: I6d2db37db3bb82f4f9ecc84b17dbf121819a6c1b
2012-04-10 12:56:27 -07:00
Eric Laurent
855255d89f
audio preprocessing: added static factory method
...
Added static methods to check availability and create audio preprocessing
effects.
Change-Id: I945e97fe41912ff8880befacaba162a08b5a1267
2012-04-10 12:34:07 -07:00
George Mount
ad0ef21011
Merge "Keep selection handles in edit fields."
2012-04-10 12:33:58 -07:00
Daniel Sandler
0af489568d
Fix PowerMgr NPE on emulator.
...
Bug: 6313695
Change-Id: Ib12b9102df01603df135cef03fd2a2f6e3634dd1
2012-04-10 15:15:32 -04:00
Robert Ly
af16675097
docs: fixing renderscript doc bug 6111834
...
Change-Id: Iea6fdaf03a0064462d57e4b62500ad689ba2b824
2012-04-10 11:56:33 -07:00
Gilles Debunne
d3ce6f50c1
Merge "Faster and simpler replace in SSB, take two"
2012-04-10 11:00:57 -07:00
Dianne Hackborn
79af6063d5
Merge "Hide the optional permission stuff, not making it in to JB."
2012-04-10 10:31:28 -07:00
Teng-Hui Zhu
450c75a59b
am 6e32ebdf: (-s ours) am bbc46ae7: am 544f89ae: Update SurfaceTexture interface for forward compatibility
...
* commit '6e32ebdff1365d754ad3ad8e156aa941d162d129':
Update SurfaceTexture interface for forward compatibility
2012-04-10 09:13:54 -07:00
Teng-Hui Zhu
6e32ebdff1
am bbc46ae7: am 544f89ae: Update SurfaceTexture interface for forward compatibility
...
* commit 'bbc46ae7499bc0fa67612c67dd23c1758336c935':
Update SurfaceTexture interface for forward compatibility
2012-04-10 08:42:23 -07:00
Teng-Hui Zhu
bbc46ae749
am 544f89ae: Update SurfaceTexture interface for forward compatibility
...
* commit '544f89aece46e8f4bbe4eed93116c8736e68ac07':
Update SurfaceTexture interface for forward compatibility
2012-04-10 08:38:39 -07:00
Teng-Hui Zhu
544f89aece
Update SurfaceTexture interface for forward compatibility
...
Change-Id: I32d224428c0127800714a976b4d7bb68cc7c2464
2012-04-10 07:35:54 -07:00
Brian Colonna
0b2b1feaa2
Merge "Passing useLiveliness flag to FUL in startUi call"
2012-04-10 06:25:26 -07:00
Jack Palevich
7dee7a38ba
Notify monitor waiters when changing mSurfaceIsBad value.
...
Otherwise the waiters might not wake up, leading to ANRs.
Bug: 6307843
Change-Id: I0646b4e8368f80dbff46342f75709992796973fd
2012-04-10 06:05:42 -07:00
Daniel Sandler
c38cf4c7db
Merge "New Android Dreams architecture, disabled for now."
2012-04-10 05:33:07 -07:00
Scott Main
06cce88529
am 37250468: am be36ea9e: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
...
* commit '372504684fa0f74c290e0eaf7134979a55118fea':
2012-04-09 23:59:12 -07:00
Scott Main
372504684f
am be36ea9e: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
...
* commit 'be36ea9e04df8f3b97dec7793e37fa1d1465922b':
2012-04-09 23:55:47 -07:00
Jesse Hall
9d873d439f
Merge "Avoid waking EGL in getInitCount"
2012-04-09 22:43:34 -07:00
Jesse Hall
3da2dc9d4c
Merge "Release the scratch pbuffer surface after use"
2012-04-09 22:41:04 -07:00
Dianne Hackborn
02da1f27ed
Merge "Fix issue #6309296 : Framework returns Configuration.SCREENLAYOUT_SIZE_LARGE for Xoom"
2012-04-09 17:45:06 -07:00
Scott Main
0ffb60aa68
am 2f133265: am b92851d8: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
...
* commit '2f133265d0eb601885a608114b6bbc5b8a710f16':
2012-04-09 17:14:59 -07:00
Scott Main
99ae11bf8d
am 14d3b807: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
...
* commit '14d3b807b730e04d90d6dd9c9569decdf12cc9cb':
docs: Add 101 class about supporting various devices
2012-04-09 17:11:42 -07:00
Scott Main
2f133265d0
am b92851d8: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
...
* commit 'b92851d850a778d1a2e5a797c2ddd315b61b15f9':
docs: Add 101 class about supporting various devices
2012-04-09 17:11:21 -07:00
Scott Main
be36ea9e04
am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
...
* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
docs: Add 101 class about supporting various devices
2012-04-09 17:08:28 -07:00
Scott Main
b92851d850
am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
...
* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
docs: Add 101 class about supporting various devices
2012-04-09 17:08:11 -07:00
Scott Main
14d3b807b7
am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
...
* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
docs: Add 101 class about supporting various devices
2012-04-09 17:08:09 -07:00
Scott Main
a5894871b2
Merge "docs: Add 101 class about supporting various devices" into ics-mr1
2012-04-09 17:06:15 -07:00
John Grossman
8100960892
am e1d6c080: Make common_time more deferential when coming out of networkless mode.
...
* commit 'e1d6c080f0b1769637d742e51cc22167c7af12bb':
Make common_time more deferential when coming out of networkless mode.
2012-04-09 17:00:24 -07:00
Adam Powell
2ac05e9c0f
Merge "Restrictions for action buttons with text"
2012-04-09 16:49:47 -07:00
Scott Main
60e5e432d9
docs: Add 101 class about supporting various devices
...
Change-Id: Iafeb99c9dab8462236a41cc4991085062ff7fa14
2012-04-09 16:39:38 -07:00
Adam Powell
a7dec6d973
Restrictions for action buttons with text
...
Restrict action buttons with text to 2 lines max. Action buttons with
text will always consume at least 2 cells in split mode because they
look silly in 1.
Note that this affects text provided by menu items, not TextViews
embedded within app-provided action views.
Fixes bug 6236467
Change-Id: I7bcbf80f448b13a895ddc3bc6a7a555c0f0bac7c
2012-04-09 16:37:52 -07:00
Scott Main
9c8b381136
am 35c97085: am 7ec02d76: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
...
* commit '35c97085008b6d6409afb62a2c452460f148d89c':
2012-04-09 16:28:58 -07:00
Dianne Hackborn
077ee85317
Fix issue #6309296 : Framework returns Configuration.SCREENLAYOUT_SIZE_LARGE for Xoom
...
Change-Id: I5882e6f6ab249232b69bdc4b8e692716f2fe5efa
2012-04-09 16:27:07 -07:00
Scott Main
35c9708500
am 7ec02d76: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
...
* commit '7ec02d7648a030edaf730b6d5ff04fe888009bc3':
2012-04-09 16:26:16 -07:00