Commit Graph

39248 Commits

Author SHA1 Message Date
Nicolas Roard
d876231e77 Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work." 2011-10-05 11:35:29 -07:00
Dianne Hackborn
1186816d75 Merge "Always unfreeze display." 2011-10-05 11:25:19 -07:00
Dianne Hackborn
eafaafa724 Merge "Some new ICS target SDK changes." 2011-10-05 11:25:02 -07:00
Dianne Hackborn
2225e995e1 Merge "Fix issue #5348948: Third Party app "Byki Turkish" shows..." 2011-10-05 11:15:13 -07:00
Andreas Huber
ea42e614bf Merge "Set crop params to ANative Window during Initialization." 2011-10-05 10:36:20 -07:00
Irfan Sheriff
19bc6e3877 Merge "Handle unexpected interface up/down events" 2011-10-05 10:03:54 -07:00
Steve Block
8ed8980188 Merge changes I447cd196,I0c6cdae4
* changes:
  SSL-related cleanup in BrowserFrame and SslCertLookupTable
  Clean up SslErrorHandlerImpl
2011-10-05 10:00:59 -07:00
Steve Block
b90050cf56 Merge "Fix BrowserFrame to construct SslError using the full URL, rather than the host" 2011-10-05 09:46:27 -07:00
Joe Fernandez
f37b86d5f9 Merge "docs: Camera class JavaDoc FixIts for ICS" 2011-10-05 09:23:03 -07:00
Narayan Kamath
536ada11d3 Merge "Allow listeners to be set before the service connects." 2011-10-05 06:52:24 -07:00
Steve Block
451c32a33b Merge "Clean up SslError" 2011-10-05 02:28:15 -07:00
Xavier Ducrohet
370152271a Merge "LayoutLib: fix support for textScaleX." 2011-10-04 19:40:23 -07:00
Romain Guy
8bc8b055a3 Merge "Canvas.getClipBounds() was broken and unreliable with OpenGL ES 2.0" 2011-10-04 19:22:41 -07:00
Xavier Ducrohet
7d78c778be Merge "Layoutlib: Typeface support for loading fonts manually." 2011-10-04 19:10:33 -07:00
Xavier Ducrohet
fa1794c18c Merge "Layoutlib now parses system_fonts.xml instead of its own." 2011-10-04 19:10:13 -07:00
Danielle Millett
e5fb988a96 Merge "Adding a flag for if biometric weak has ever been used" 2011-10-04 18:44:55 -07:00
Dianne Hackborn
03623dafb4 Merge "Fix issue #5388352: font size change back to normal" 2011-10-04 18:35:19 -07:00
Fabrice Di Meglio
bcf0bd1629 Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"" 2011-10-04 17:24:37 -07:00
Svetoslav Ganov
1f32fb119b Merge "Make prompt for headset while typing a password if accessibilbity is on less verbose." 2011-10-04 17:14:57 -07:00
Scott Main
6742e16ef2 Merge "adding Android Beam sample" 2011-10-04 17:09:38 -07:00
Dave Santoro
8d6e66d910 Merge "Fix permission strings to match ICS-FactoryROM." 2011-10-04 16:19:27 -07:00
Christopher Tate
bb7a593bf7 Merge "Add -nosystem flag to adb backup" 2011-10-04 16:16:11 -07:00
Jason Sams
f2ccbfb4af Merge "Fix crash running old HC apps." 2011-10-04 15:53:37 -07:00
Dave Santoro
d31a2f7c8b am 7d535138: (-s ours) DO NOT MERGE New permissions for social stream.
* commit '7d535138c15b3e9f90432fb942f9027fa334b681':
  DO NOT MERGE New permissions for social stream.
2011-10-04 15:48:22 -07:00
Dave Santoro
838e7b857a Merge "Add new permissions for read/write social stream." 2011-10-04 15:46:10 -07:00
Ben Komalo
517eeff029 Merge "New PIN unlock screen layout." 2011-10-04 14:27:24 -07:00
Joe Fernandez
9dea72b0b4 Merge "docs: add developer guide cross-references, Project ACRE" 2011-10-04 14:03:12 -07:00
Michael Jurka
18ae21fc8c Merge "Reduce height of recent app thumbnails" 2011-10-04 14:01:08 -07:00
The Android Open Source Project
5c5e7fac71 Reconcile with ics-factoryrom-release
Change-Id: I35a78040547d4f13dcf96639a229b0b64a18bbf8
2011-10-04 13:56:58 -07:00
Jeff Sharkey
df35943d11 Merge "Read iface stats from single proc file." 2011-10-04 13:52:24 -07:00
Danielle Millett
9a885ed043 Merge "Fix 5405210: DevicePolicyManager doesn't allow Face Unlock" 2011-10-04 13:23:55 -07:00
Jeff Sharkey
676ffda2e5 Merge "Track xtables summary, move tether stats, time." 2011-10-04 13:12:06 -07:00
Amith Yamasani
f20850c94e Merge "Tie the lockscreen sounds with the ringer volume." 2011-10-04 13:02:31 -07:00
Irfan Sheriff
533367582f Merge "Reduce/Fix system logging" 2011-10-04 12:13:27 -07:00
Gilles Debunne
b2bce00b0a Merge "5402566: Copy/cut icons do not appear if the text is Japanese only" 2011-10-04 10:51:13 -07:00
Gilles Debunne
10afdff9ff Merge "Optimisations and bugs in SpellChecker" 2011-10-04 10:50:54 -07:00
Matthew Xie
f870117435 Merge "Send TURN_HOT message to the state machine from BluetoothService after it starts" 2011-10-04 10:21:37 -07:00
Kenny Root
5166e2713a Merge "Add explicit mimetype for verifier calls" 2011-10-04 09:04:06 -07:00
Alon Albert
fe89309692 Merge "Update dumpsys output" 2011-10-04 08:39:46 -07:00
The Android Automerger
ee8b7c13ec merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-04 06:28:35 -07:00
Flavio Lerda
a330f4edb3 Merge "Add a cached formatted phone number to call log." 2011-10-04 02:24:28 -07:00
Jim Miller
48feb85c1b Merge "Fix 5185505: allow facelock to be enabled by a setting." 2011-10-03 22:00:03 -07:00
Dianne Hackborn
7746cc3188 Fix handling of "allow fds" state.
Didn't take into account nesting of bundles.  Boo.

Change-Id: Ic8cf21ad8d6f4938a3e105128624c9d162310d01
2011-10-03 21:09:35 -07:00
Svetoslav Ganov
a0ac77133d Merge "The logic for not populating text to some accessibility events is scattered." 2011-10-03 18:33:32 -07:00
Jeff Brown
d16d4f869d Merge "Transfer large bitmaps using ashmem. Bug: 5224703" 2011-10-03 18:27:51 -07:00
Svetoslav Ganov
dd5707564e Merge "Accessibility services cannot obtain the source of an event coming from a root namespace descendant." 2011-10-03 17:43:39 -07:00
Danielle Millett
6995e63b5b Merge "Reworked biometric weak check functions" 2011-10-03 17:38:47 -07:00
Jeff Brown
5707dbf15d Transfer large bitmaps using ashmem.
Bug: 5224703

Change-Id: If385a66adf4c6179a0bb49c0e6d09a9567e23808
2011-10-03 17:28:13 -07:00
Dianne Hackborn
16624bd4fe Merge "Add mechanism for Parcel to not allow FDs to be written to it." 2011-10-03 17:13:54 -07:00
Justin Ho
eb53548f9a Resolve conflicts for merge 121e805a to master
Conflicts:
	CleanSpec.mk

Change-Id: I750218dbd78e15c1ae3324b3bcfbcd28a4da2676
2011-10-03 17:06:26 -07:00