Commit Graph

16970 Commits

Author SHA1 Message Date
Dianne Hackborn
46d6bcfb95 Merge "resolved conflicts for merge of 872a1e79 to master" 2011-06-16 16:38:07 -07:00
Romain Guy
bec9be2f51 Merge "Prevent TweetDeck from crashing." 2011-06-16 16:14:06 -07:00
Romain Guy
5d5d1ff2d5 Prevent TweetDeck from crashing.
Change-Id: I964d9152010060c3a2698cdb6c22ac21da1af8b0
2011-06-16 16:13:01 -07:00
Dianne Hackborn
a7f88508d3 resolved conflicts for merge of 872a1e79 to master
Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74
2011-06-16 16:01:27 -07:00
RoboErik
29ddc3bc27 Merge "Adds more docs to classes in CalendarContract" 2011-06-16 15:44:08 -07:00
RoboErik
3771fcbc19 Adds more docs to classes in CalendarContract
Change-Id: I73d93a6a823100394a707e6b85de40fc6e242c03
2011-06-16 15:41:31 -07:00
Dianne Hackborn
872a1e793c am 9a73c4d3: am 2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '9a73c4d3a9c7ce02f80b078ca9ba5106234ecd9c':
  SDK only: integrate new sample code, deprecating along the way.
2011-06-16 15:25:22 -07:00
Dianne Hackborn
9a73c4d3a9 am 2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
  SDK only: integrate new sample code, deprecating along the way.
2011-06-16 15:22:10 -07:00
Dianne Hackborn
2f04883ff8 SDK only: integrate new sample code, deprecating along the way.
The new support library features and sample code for switching
between fragments using a TabHost now eliminates the utility of
the TabActivity class, so deprecate it.  This also means there is
no longer any use in ActivityGroup or LocalActivityManager.  Yay.

Also fix up things so the new support API demos are included in
the documentation.

Change-Id: I4f073b82787f32560ba1fa5b6a23746ecc8aecdc
2011-06-16 14:52:00 -07:00
Fabrice Di Meglio
c1f9486a3e Merge "Update getLayoutDirectionFromLocale() for using ICU" 2011-06-16 14:41:50 -07:00
Fabrice Di Meglio
c01924f156 Update getLayoutDirectionFromLocale() for using ICU
- now relying on ICU.getScript() and ICU.addLikelySubtags() for getting the locale script
- clean unit tests imports

Change-Id: Icdc45fa78490d1e2dde0e83bca0feea8aa205cdf
2011-06-16 14:40:31 -07:00
Chet Haase
b47f2f9533 Merge "Fix crash in ViewPropertyAnimator for unparented view." 2011-06-16 14:06:36 -07:00
Chet Haase
3a000a52d6 Fix crash in ViewPropertyAnimator for unparented view.
Mechanism for removing possible earlier animations should
call removeCallbacks on the view, not on the (possibly null)
handler of the view.

Change-Id: I76c6f0bea5e009be9197a6e49e9360ed9ef1a9cb
2011-06-16 14:03:08 -07:00
RoboErik
da67237225 Merge "Add DroidDocs to Events class" 2011-06-16 13:51:16 -07:00
RoboErik
fe37b49dd4 Add DroidDocs to Events class
Change-Id: I85b14e8a553a1bc160d05a9f076d4aea77e9a39f
2011-06-16 13:40:02 -07:00
Jeff Sharkey
ad4c9ed7de Merge "DownloadManager flags for network policy." 2011-06-16 13:39:02 -07:00
John Reck
179cfcf654 Merge "Inline SeekBarPreference" 2011-06-16 13:21:52 -07:00
Jeff Sharkey
1a30395358 DownloadManager flags for network policy.
Handful of DownloadManager flags to record when a download was paused
because of NetworkPolicyManager rules.

Change-Id: I99fc47f529cb6c8a42dbeca049e0cd0f1556eac4
2011-06-16 13:04:34 -07:00
Robert Greenwalt
4f1f7d3158 am 241b65ac: am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '241b65aca93e263f0869c5bec4ad1dbda0dec6db':
  Reset connections AFTER we take down the network.
2011-06-16 12:50:46 -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 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
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
Fabrice Di Meglio
7e27e489d8 Merge "Introduce LocalUtil and getLayoutDirectionFromLocale() now use likelySubtags" 2011-06-15 17:49:24 -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
Romain Guy
81d7848f17 Merge "Properly refcount SurfaceTexture in the JNI layer." 2011-06-15 16:49:57 -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
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
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
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
Debashish Chatterjee
45d937ed0a Merge "Modified Voicemail.SOURCE_DATA value to match with the constant name." 2011-06-15 10:45:03 -07:00