22841 Commits

Author SHA1 Message Date
John Wang
1766974b02 am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit '03cbb58e2418dc22ae18a8648404382da4ee46e8':
  Support SIM permanently disabled state.
2011-06-16 12:49:17 -07:00
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
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
Chia-chi Yeh
d6f69d0e52 Merge "VPN: migrate from generic Bundle to our own Parcelable VpnConfig." 2011-06-16 10:34:34 -07:00
Jean-Baptiste Queru
ce6f85ec40 Merge f28f1de3 - regen current.txt
Change-Id: I7875932a0634542251f53855b4e8620a089de05f
2011-06-16 10:21:18 -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
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
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
Fabrice Di Meglio
7e27e489d8 Merge "Introduce LocalUtil and getLayoutDirectionFromLocale() now use likelySubtags" 2011-06-15 17:49:24 -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
Svetoslav Ganov
fa59d178bb Merge "Invisible views should not be visible to accessibility services (interrogation)" 2011-06-15 17:30:10 -07:00
Svetoslav Ganov
ea1da3d2e6 Invisible views should not be visible to accessibility services (interrogation)
1. Infisible children of a ViewGroup are reported by View group
   while constructing an AccessibilityNodeInfo.

2. AncestorView does not check whether a found view is shown before
   returining it or perform action on it.

bug:4672230
Change-Id: Ic620ea71b7755c598407bdd813a2beeee400c89c
2011-06-15 17:28:10 -07:00
Dianne Hackborn
f28f1de391 am 413b53b5: am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2
* commit '413b53b57d62b60e98cfe5b9359551315e7cb3a7':
  We must keep up with the Joneses.
2011-06-15 17:12:45 -07:00
Dianne Hackborn
413b53b57d am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2
* commit '70921d615496c5be8a19cbd1454378bb7d0201f3':
  We must keep up with the Joneses.
2011-06-15 17:10:33 -07:00
Chia-chi Yeh
04ba25c418 VPN: migrate from generic Bundle to our own Parcelable VpnConfig.
Note that VpnConfig is for internal use only.
Also remove hidden methods from ConnectivityManager.

Change-Id: Ic298c4dc9a2c6c452bd8f4be6fa84e7ac489c0c4
2011-06-15 17:08:58 -07:00
Dianne Hackborn
70921d6154 Merge "We must keep up with the Joneses." into honeycomb-mr2 2011-06-15 17:08:04 -07:00
Dave Santoro
7ff1c2aefd Merge "Added profile string descriptions and limits." 2011-06-15 16:56:45 -07:00
Michael Jurka
d727cf7e3f Merge "Port recent apps from tablet to phone" 2011-06-15 16:51:22 -07:00
Michael Jurka
3b1fc47d00 Port recent apps from tablet to phone
- wire up to long press on home
- remove unused recents activity
- remove duplicate recents resources in -large directories (using -sw600dp instead)
- fix issue with zoom/scale translation when recents was brought up

Change-Id: I45538ccaff49b46ac3659c4828f9e2b0cd075241
2011-06-15 16:50:04 -07:00
Romain Guy
81d7848f17 Merge "Properly refcount SurfaceTexture in the JNI layer." 2011-06-15 16:49:57 -07:00
Dave Santoro
7fb888ac89 Added profile string descriptions and limits.
Bug: 4584896
Change-Id: I0b73022a179a850c047a17ea03117f54931a748a
2011-06-15 16:47:26 -07:00
Eric Fischer
a5608e3a67 am c0e84cf3: am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'c0e84cf3210fc6b5929d024fafbe75f08167c44e':
  Import revised translations.  DO NOT MERGE
2011-06-15 16:47:08 -07:00
Eric Fischer
c0e84cf321 am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '5e451faa0c22e943fb76d812f699d51fa11c5495':
  Import revised translations.  DO NOT MERGE
2011-06-15 16:41:44 -07:00
Eric Fischer
5e451faa0c Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-06-15 16:38:43 -07:00
Romain Guy
e5e0c50f7d Properly refcount SurfaceTexture in the JNI layer.
Change-Id: I4b4c8020c13b8d6ce0d302fe42410033bf5785a6
2011-06-15 16:14:26 -07:00
Fabrice Di Meglio
a47f45e482 Introduce LocalUtil and getLayoutDirectionFromLocale() now use likelySubtags
- move code from Configuration to LocaleUtil
- move unit tests

Change-Id: Ic14b0131894a0c5618f00d4acb3edb0daadefe01
2011-06-15 16:12:32 -07:00
Svetoslav Ganov
13774d2e38 AccessibilityNodeInfo not properly returning checked status
1. CompundButton was not setting its checked state in the info.

bug:4674048

Change-Id: Ic711d4ee9b2214e9bdf86546df406b497aaa90b5
2011-06-15 15:32:11 -07:00
Dianne Hackborn
0d4b9c993d We must keep up with the Joneses.
Change-Id: Ifa2ab0167c09ba18b24c8b6c618db807e17519f5
2011-06-15 15:09:54 -07:00
Eric Fischer
dbad552d17 Import revised translations. DO NOT MERGE
Change-Id: Iaff03724a335f856f7d28b1bc2c219f4208c4151
2011-06-15 15:06:18 -07:00
Irfan Sheriff
1e8b3e4e76 am 11954872: am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
* commit '1195487228e1eb6c8859368286168051bd505b2f':
  Fix lease duration handling
2011-06-15 14:10:51 -07:00
Irfan Sheriff
1195487228 am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
* commit '5af3405f0d24c853bd10eb239c081e31972d3e1d':
  Fix lease duration handling
2011-06-15 14:07:54 -07:00
Irfan Sheriff
5af3405f0d am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
* commit 'ecda5461603b6de77beb045dfdf82dad7ae48d61':
  Fix lease duration handling
2011-06-15 14:04:23 -07:00
Marco Nelissen
181aafd75c am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
* commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6':
  Ignore duplicate WAP push PDU source/destination port if configured
2011-06-15 13:44:56 -07:00
Martijn Coenen
554344ee74 Merge "Added vcard query parameter for not attaching photo." 2011-06-15 13:31:53 -07:00
Irfan Sheriff
56878760c3 Fix lease duration handling
Convert lease time in seconds to long before alarm
set up and add sanity check

Change-Id: I99524c97d9a643ffa8234d016d0e819a284977a1
2011-06-15 12:58:18 -07:00
Marco Nelissen
9c3c3004c4 am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
* commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
  Ignore duplicate WAP push PDU source/destination port if configured
2011-06-15 12:20:57 -07:00
Eric Fischer
5f0c1d2ad8 Import revised Croatian translations.
Change-Id: I9fb9bf6796d19e4b419381a0dd398f53bf2e879f
2011-06-15 12:10:52 -07:00
Chia-chi Yeh
f8905fd13d VPN: change some strings in VPN notifications.
Also remove a small piece of dead code.

Change-Id: Idd10f3d72a92228951278bf360d08ba9bede02d2
2011-06-15 11:06:52 -07:00
Narayan Kamath
9ee8154e59 Increase the visibility of SynthesisRequest
This makes it a lot easier for engine implementers
to test their engine. This is a dumb data object, and
contains no logic whatsoever.

Change-Id: I2a8bea134a8ff6b962508cfed67ea6085a682b23
2011-06-15 18:50:23 +01:00