Commit Graph

38955 Commits

Author SHA1 Message Date
Bart Sears
8acda78034 Revert "Transfer large bitmaps using ashmem. Bug: 5224703"
This reverts commit 56c58f66b97d22fe7e7de1f7d9548bcbe1973029

This CL was causing the browser to crash when adding bookmarks, visiting the bookmarks page, and sharing pages (see bug http://b/issue?id=5369231
2011-09-25 14:30:21 -07:00
Jeff Brown
f4c1088d75 Transfer large bitmaps using ashmem.
Bug: 5224703

Change-Id: Ic7481dd9f173986f085a8bbdcc59bbe9830d7a44
2011-09-23 21:20:47 -07:00
Jeff Brown
5cecad7dc9 Merge "Prevent unintended rotations. Bug: 4981385" 2011-09-23 18:28:01 -07:00
Adam Powell
5dbf2640fa Merge "Fix bug 5355889 - Search action showing up in the menu dropdown in spite of search actionview being expanded" 2011-09-23 18:16:22 -07:00
Russell Brenner
688b44de66 am a6ccaa73: Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom
* commit 'a6ccaa736d18d1ee375162e9df9d2aad8db869e5':
  Replaced Lohit_Hindi with Lohit-Devanagari
2011-09-23 17:40:31 -07:00
Russell Brenner
848b09071f Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom 2011-09-23 17:38:10 -07:00
Eric Fischer
72fa2193ec am b8c78262: Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom
* commit 'b8c7826264816492ff91a27b1eb2d0d1454053e1':
  Mark MCC locale replacement strings not translatable.
2011-09-23 15:46:56 -07:00
Eric Fischer
673a6445f8 Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom 2011-09-23 15:45:27 -07:00
Eric Fischer
ed0bb9bea2 am 90bf4765: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '90bf47658855c2ab0d85933d2fc7925ec3de6bf4':
  Import revised translations.  DO NOT MERGE
2011-09-23 15:39:51 -07:00
Eric Fischer
250e4f6dc3 Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-23 15:37:46 -07:00
Irfan Sheriff
85f1af8f1a am c21994bc: Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom
* commit 'c21994bc26df959d1a7161e38b4402b7255ea321':
  Fix watchdog to stop ping after wifi disconnects
2011-09-23 15:20:56 -07:00
Irfan Sheriff
ceac65ebc8 Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom 2011-09-23 15:18:37 -07:00
Fabrice Di Meglio
e0db82163c Merge "Fix bug #5349461 TextView: text that ends with an ImageSpan causes line height to shrink to ImageSpan height" 2011-09-23 15:18:37 -07:00
Brian Colonna
d4a9a7adf0 Merge "Changed result of entering credentials after forgot pattern" 2011-09-23 15:09:15 -07:00
Adam Powell
b972130da6 Merge "Fix bug 5341139 - bottom bar stays if app wants to handle orientation change" 2011-09-23 15:06:30 -07:00
Dianne Hackborn
beaf6908be Merge "Fix issue #5173952: Opening a Notification From Lock Screen..." 2011-09-23 14:54:26 -07:00
John Reck
dc2b90a8fe Merge "Add detail to restorePicture deprecation" 2011-09-23 14:48:52 -07:00
Eric Laurent
2ba740ee7b Merge "Fix issue 5355047: Automated effect tests fail." 2011-09-23 14:43:12 -07:00
Fabrice Di Meglio
18545e60d3 Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits" 2011-09-23 13:30:41 -07:00
Svetoslav Ganov
54a5ca150c Merge "Scroll accessibility events should not populate text." 2011-09-23 13:26:18 -07:00
Amith Yamasani
945abfc3f3 Merge "Launch nested preferences with the same theme as parent activity." 2011-09-23 13:24:38 -07:00
Christopher Tate
d6fd1e3322 am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom
* commit 'b20d378cec09da18301eb9c33bc88251beb81042':
  Don't crash during full backup when CheckJNI is enabled
2011-09-23 13:21:07 -07:00
Christopher Tate
367dedc53e Merge "Don't crash during full backup when CheckJNI is enabled" into ics-factoryrom 2011-09-23 13:19:33 -07:00
Scott Main
a33317e9e2 Merge "docs: a few additions and revisions to action bar docs" 2011-09-23 13:13:13 -07:00
Dianne Hackborn
0f8f963ae4 Merge "Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly" 2011-09-23 12:56:42 -07:00
Kenny Root
b322b2daa9 Merge "Less verbose message when dexopt non-APK" 2011-09-23 12:49:44 -07:00
Adam Powell
17aaed081f Merge "Remove unnecessary parameter" 2011-09-23 12:45:13 -07:00
Andreas Huber
f47f011681 Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool." 2011-09-23 11:27:51 -07:00
David Brown
e597b355bf Merge "Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers." 2011-09-23 11:25:57 -07:00
Adam Powell
4e10649083 Merge "Fix leaky view tags" 2011-09-23 11:05:25 -07:00
Wei Huang
29ba087776 am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
  Update camera javadoc about AE and AWB lock.
2011-09-23 10:05:22 -07:00
Wei Huang
929e551f6c Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom 2011-09-23 10:04:02 -07:00
Eric Fischer
ade6d8ae78 am c4517842: Merge "Delete translations of files that no longer exist." into ics-factoryrom
* commit 'c4517842ee2a641342f151ecafb797080b9ed84d':
  Delete translations of files that no longer exist.
2011-09-23 09:45:50 -07:00
Eric Fischer
abb909024c Merge "Delete translations of files that no longer exist." into ics-factoryrom 2011-09-23 09:43:55 -07:00
Daniel Sandler
0a1c3d524b Merge "Put the correct background behind largeIcons." 2011-09-23 09:33:18 -07:00
Pannag Sanketi
c40e465bc2 am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
  Returning EOS in SurfaceMediaSource:read
2011-09-23 09:08:11 -07:00
Pannag Sanketi
f42489003e Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom 2011-09-23 09:06:55 -07:00
Wei Huang
2e9311c6f4 am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom
* commit '5d87227bad8126d701145cd07c3ac2a365e8480e':
  Clear callbacks in camera stopPreview.
2011-09-23 08:33:46 -07:00
Wei Huang
9de9110452 Merge "Clear callbacks in camera stopPreview." into ics-factoryrom 2011-09-23 08:30:32 -07:00
Brandon Keely
f61d5145f9 Merge "Make LockScreen ping() on a miss." 2011-09-23 07:46:30 -07:00
Justin Ho
6f16d54796 am a780fb8e: Merge "Updating ellipsis in Roboto Bug: 5344295" into ics-factoryrom
* commit 'a780fb8e22d72b3f2c09b16eeddeff30e417ee3c':
  Updating ellipsis in Roboto Bug: 5344295
2011-09-23 07:30:18 -07:00
Justin Ho
e35be5cb02 Merge "Updating ellipsis in Roboto Bug: 5344295" into ics-factoryrom 2011-09-23 07:28:31 -07:00
Peter Ng
451f79b94c am dd33bf0e: Merge "Fix 5355659: Minor tweak to wave ping radius in MultiWaveView." into ics-factoryrom
* commit 'dd33bf0ebbde9aa702d039b6b9d5f06ac0a69dfb':
  Fix 5355659: Minor tweak to wave ping radius in MultiWaveView.
2011-09-22 23:40:06 -07:00
Robert Greenwalt
f647fd1d1d am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom
* commit 'b849074cb58edc15b0764afdde0326c0b6d5b147':
  Tell the resolver what protocols to use.
2011-09-22 23:39:53 -07:00
Justin Ho
b60e98c327 am 4dfe8695: Merge "CAB assets" into ics-factoryrom
* commit '4dfe869520b83b79cc5912f5bd0061b0ec33aa11':
  CAB assets
2011-09-22 23:39:51 -07:00
Justin Ho
e5718aaecf am 777163e0: Merge "Updated emergency icon on lockscreen" into ics-factoryrom
* commit '777163e0466bda76d64809b5fd6a1a688de67099':
  Updated emergency icon on lockscreen
2011-09-22 23:39:49 -07:00
John Wang
55a1db61fd am dd6d1bbd: Merge "Update PUK unlock screen." into ics-factoryrom
* commit 'dd6d1bbd15c4e5cf1b3e0ac34c96f29fb04863c6':
  Update PUK unlock screen.
2011-09-22 23:39:37 -07:00
Adam Cohen
8509b5e3dd am 08ee7fa4: Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom
* commit '08ee7fa463aee5e83f77789e9a99f17a34ab68b4':
  Fixing emergency dialer flicker on lock screen (issue 5314293)
2011-09-22 23:39:33 -07:00
Justin Ho
53844020a9 am 31b638d4: Merge "Fix 5355659: Change chevron visuals, timing, and animated positioning" into ics-factoryrom
* commit '31b638d40342fc9e3198f9e7f8dffaf55049c9e1':
  Fix 5355659: Change chevron visuals, timing, and animated positioning
2011-09-22 23:39:31 -07:00
Mathias Agopian
059fd18396 Merge "don't clear the framebuffer when the framebuffer is not used" 2011-09-22 21:01:21 -07:00