Robert Greenwalt
241b65aca9
am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
...
* commit '5f3505121b761dbd3bba62d1603fbab49de139b9':
Reset connections AFTER we take down the network.
2011-06-16 12:42:15 -07:00
Mathias Agopian
19f913a887
am 35e6d686: (-s ours) am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
...
* commit '35e6d6867c63ad254e95325206aa7a927edd6797':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
2011-06-16 12:41:00 -07:00
Mathias Agopian
73b054ae37
am 552bd670: (-s ours) am d5244e0a: am 52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
...
* commit '552bd670071b519d97124621a3c11dc98062c12b':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
2011-06-16 12:40:44 -07:00
Mathias Agopian
21bd76157e
am 85c14352: (-s ours) am 7ecdeb6e: am d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
...
* commit '85c14352a4f8946a6908eac140936080536fa575':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
2011-06-16 12:39:48 -07:00
John Wang
03cbb58e24
am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
...
* commit 'ff42c04d15e000f6295e796e154cc60c54aa078b':
Support SIM permanently disabled state.
2011-06-16 12:34:34 -07:00
John Reck
014fea2a66
Inline SeekBarPreference
...
Dialog-based SeekBarPreference renamed to SeekBarDialogPreference
New inline SeekBarPreference added
Change-Id: I7a5d8f7aa554c4af4086a9bcc74cf07879c8523c
2011-06-16 12:34:02 -07:00
Robert Greenwalt
5f3505121b
Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
2011-06-16 11:34:03 -07:00
Robert Greenwalt
ec896c6a86
Reset connections AFTER we take down the network.
...
If you do it before you have a race condition and some apps will
manage to reconnect on the dieing network before it goes and then
get no notification when it goes.
bug: 3408025
Change-Id: I5386ff313c759b3f687bc38731454ab43dbe76b8
2011-06-16 11:26:54 -07:00
John Wang
ff42c04d15
Merge "Support SIM permanently disabled state." into honeycomb-LTE
2011-06-16 11:22:53 -07:00
Philip Milne
b6a6d59547
Merge "Future-proofing: change Alignment interface to abstract class and add a parameter for measurementType."
2011-06-16 11:18:42 -07:00
Dianne Hackborn
f77ae6e65a
New orientation handling. Only impacts SDK (aapt dump badging).
...
This is a new way of determining whether an application requires
specific orientations, done by looking at any requirements in its
activity tags. Note that this won't catch all possible issues,
because applications can still force an orientation through Java
APIs, but the vast majority of applications that actually require
a specific orientation should be doing it this way because it the
easiest way and the only way to cleanly launch into the app from
a different orientation without doing some serious activity tricks.
Change-Id: I11d32104f6bc3d2a72aeeff1ca150b8f1c9f5588
2011-06-16 11:13:20 -07:00
Alex Sakhartchouk
8650c32907
Adding ability to read back fbo data to renderscript
...
Change-Id: Ie684c26cbcde22f2483b43415dfc39a3de22c5a1
2011-06-16 11:05:13 -07:00
Chia-chi Yeh
d6f69d0e52
Merge "VPN: migrate from generic Bundle to our own Parcelable VpnConfig."
2011-06-16 10:34:34 -07:00
Gloria Wang
464c120266
Merge "-Fix some typo -Remove one unnecessary memory allocation"
2011-06-16 10:23:04 -07:00
Jean-Baptiste Queru
ce6f85ec40
Merge f28f1de3 - regen current.txt
...
Change-Id: I7875932a0634542251f53855b4e8620a089de05f
2011-06-16 10:21:18 -07:00
Daniel Sandler
396263fc97
Make the Notify Builder test usable on phones.
...
Change-Id: Ibaa3b2b99bde7dfd3d9fc6bc4c0068fc1d7b914d
2011-06-16 13:02:02 -04:00
Eric Fischer
b0733e2c4f
am a5608e3a: (-s ours) am c0e84cf3: am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'a5608e3a67a86f55e8c5ce971934f32c398f2525':
Import revised translations. DO NOT MERGE
2011-06-16 09:31:53 -07:00
Irfan Sheriff
32d24f8fe7
am 030a8c65: am a4644307: (-s ours) am df1734e3: Fix lease duration handling
...
* commit '030a8c65dff975e19b78d957dceee61e73451ea7':
Fix lease duration handling
2011-06-16 09:31:21 -07:00
Narayan Kamath
edd12149f0
Merge "Don't enforce defaults any more in the TextToSpeech API."
2011-06-16 03:05:07 -07:00
Narayan Kamath
c3edf2a01a
Don't enforce defaults any more in the TextToSpeech API.
...
This has been discussed in an email thread. This brings the
text to speech API in line with other android APIs.
The user can set default speech rates / languages and
engine preferences, which the API obeys BUT these can be
overriden by individual apps (much like intent.setComponent
and intent.setClassName can be used to launch a specific
handler for a given intent).
Also, all installed engines are enabled by default. The
user is shown the "data privacy" warning every time an
installed engine is set to the default.
Change-Id: I24f5f331b3a7cc7ce1a62962192e3a452bdca9d4
2011-06-16 10:31:45 +01:00
Kenny Root
9266847e6b
Merge "Fix crash determining direction of invalid locale"
2011-06-16 02:30:37 -07:00
Kenny Root
49e3b372ab
Fix crash determining direction of invalid locale
...
The layoutlib is used in the SDK which might not have a default Locale,
so the language string will be some kind of junk. This causes a crash in
the new LocaleUtils
Change-Id: I24e5115c56e39d394dcf89ec6cff609525b3c73e
2011-06-16 02:28:00 -07:00
Narayan Kamath
df60dc327f
Merge "Increase the visibility of SynthesisRequest"
2011-06-16 01:58:06 -07:00
Wu-cheng Li
beb9ecf372
Merge "Allow camera to be disabled via Device Policy Manager"
2011-06-16 01:05:43 -07:00
Kenny Root
fb2f3a530f
Merge "Use rand() for MinGW"
2011-06-15 23:10:30 -07:00
Mathias Agopian
35e6d6867c
am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
...
* commit '0887b8c2e583e682cd2c1bc909cb3fdbec704004':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
2011-06-15 22:42:52 -07:00
Mathias Agopian
0887b8c2e5
am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
...
* commit '8e18668d14adf601cbe5973030c310ec23d88461':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
2011-06-15 22:40:07 -07:00
Mathias Agopian
552bd67007
am d5244e0a: am 52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
...
* commit 'd5244e0a88ed2f843651aa5ffdc71a45c968e0f3':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
2011-06-15 22:12:32 -07:00
Mathias Agopian
d5244e0a88
am 52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
...
* commit '52a43990880b27808bcf562afcc4209d34728e6e':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
2011-06-15 22:09:39 -07:00
Kenny Root
e04f826fef
Use rand() for MinGW
...
The version of MinGW we use doesn't have nrand48() which is really lame,
but we need to use libutils in the Windows SDK.
Change-Id: If854c03dbf02bc29e79f49e4539f08c2bf057517
2011-06-15 20:55:49 -07:00
Mathias Agopian
8e18668d14
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
...
This reverts commit 52a43990880b27808bcf562afcc4209d34728e6e.
Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
2011-06-15 20:45:32 -07:00
Mathias Agopian
52a4399088
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
...
This reverts commit af6edba59e250adbdfa5b3c3be134f70d8c38a16.
Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
2011-06-15 20:42:25 -07:00
Mathias Agopian
85c14352a4
am 7ecdeb6e: am d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
...
* commit '7ecdeb6e548ff71d4f70b343e30136e89eaa3e33':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
2011-06-15 20:21:31 -07:00
Mathias Agopian
7ecdeb6e54
am d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
...
* commit 'd20d72d193ab0d7f33c839d8bf9573b55abfebdc':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
2011-06-15 20:18:24 -07:00
Mathias Agopian
d20d72d193
Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
2011-06-15 20:16:15 -07:00
Mathias Agopian
af6edba59e
revert surfaceflinger leak fix as it uncovered a crasher on xoom
...
Bug: 4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
2011-06-15 19:31:04 -07:00
Philip Milne
c9885f6557
Future-proofing: change Alignment interface to abstract class and add a parameter for measurementType.
...
Also included bugfix from Winson: arcs wre not being cleared in invalidateStructure() so
state wasn't properly cleared when children were added after the first layout operation.
Change-Id: I7b46eadd955bd74b7bb3e4dad2f47ed3f092ff63
2011-06-15 19:08:40 -07:00
Yu Shan Emily Lau
0a4d51d581
Merge "Add new open source test contents. Removed old test files. Updated the tests with new test contents."
2011-06-15 18:47:55 -07:00
Yu Shan Emily Lau
c4fe54a238
Add new open source test contents.
...
Removed old test files.
Updated the tests with new test contents.
Change-Id: Id74f1aae391ef868843ab4058ae9a9328d98f868
2011-06-15 18:45:54 -07:00
Romain Guy
a27ad3cca3
Merge "Correctly register native methods."
2011-06-15 17:58:13 -07:00
Romain Guy
035f1010eb
Correctly register native methods.
...
Change-Id: Ic82a2b9c5dd7fb5dc23650c4d5aa208ef8563a31
2011-06-15 17:57:28 -07:00
Xia Wang
37701dcfd6
Merge "Add opengl bench mark test: -- display icons with livewallpaper background (galaxy)"
2011-06-15 17:53:02 -07:00
Xia Wang
2dc7afd9c4
Add opengl bench mark test:
...
-- display icons with livewallpaper background (galaxy)
Change-Id: I5b49bc732180069957abb47d206b5849c47469df
2011-06-15 17:51:52 -07:00
Fabrice Di Meglio
7e27e489d8
Merge "Introduce LocalUtil and getLayoutDirectionFromLocale() now use likelySubtags"
2011-06-15 17:49:24 -07:00
Dianne Hackborn
c1972e1f65
Merge "Fix to clear calling identity when binding a widget."
2011-06-15 17:47:08 -07:00
Romain Guy
280b7fd095
Merge "Forgot to ammend the change"
2011-06-15 17:45:20 -07:00
Romain Guy
b38484ccb9
Forgot to ammend the change
...
Change-Id: Ic6b0be487245a6bb926ab8b6b66b7c63ea1130c6
2011-06-15 17:43:08 -07:00
Dianne Hackborn
4912f16087
Fix to clear calling identity when binding a widget.
...
Change-Id: Id66abc50ec9ee69317b9838f302c4153995664f7
2011-06-15 17:40:44 -07:00
Gloria Wang
2980a21375
-Fix some typo
...
-Remove one unnecessary memory allocation
Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
2011-06-15 17:32:06 -07:00
Svetoslav Ganov
fa59d178bb
Merge "Invisible views should not be visible to accessibility services (interrogation)"
2011-06-15 17:30:10 -07:00