Commit Graph

36728 Commits

Author SHA1 Message Date
Svetoslav Ganov
4ddff39362 Merge "Exception in TouchExplorer due to invalid pointer id." 2011-07-16 13:42:11 -07:00
Jeff Brown
ffaf69119c Merge "Add support for orientationAware touch pads. Bug: 5038388" 2011-07-15 21:06:09 -07:00
Jeff Brown
b3bea6df94 Merge "Remove more edge flag cruft." 2011-07-15 21:05:36 -07:00
Fabrice Di Meglio
abab7426cf Merge "Fix bug #4972141 Overlapping content in single-choice dialogs" 2011-07-15 17:51:46 -07:00
Daniel Lehmann
917cb11822 Merge "Use higher resolution in in-call UI if available." 2011-07-15 17:41:36 -07:00
Eric Fischer
9c8b60dad3 Merge "Import revised translations." 2011-07-15 17:04:36 -07:00
Fabrice Di Meglio
df5273f893 Merge "Some code refactoring" 2011-07-15 16:52:03 -07:00
Romain Guy
d155e6cf11 Merge "Don't break the build..." 2011-07-15 16:51:30 -07:00
Romain Guy
a4d6fed95a Merge "Remove unused code" 2011-07-15 16:46:39 -07:00
Glenn Kasten
3e9f37a231 Merge "Log CPU usage" 2011-07-15 16:27:13 -07:00
Glenn Kasten
f795f549b2 Merge "CPU statistics library" 2011-07-15 16:24:26 -07:00
Rajneesh Chowdury
506c171014 Merge "Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF" 2011-07-15 16:08:01 -07:00
John Reck
875bc46d68 Merge "Implement SeekBarPreference.onGetDefaultValue" 2011-07-15 15:58:43 -07:00
Chet Haase
af5d4054bd Merge "Fix leak in LayoutTransition" 2011-07-15 15:29:30 -07:00
Chia-chi Yeh
8a75cfa5d9 Merge "VpnDialogs: change paddings." 2011-07-15 15:22:56 -07:00
Christopher Tate
d160a8b33f Merge "Support for compressed backups" 2011-07-15 15:05:53 -07:00
Irfan Sheriff
18ffebd8b7 Merge "WifiWatchdog rewrite to formal statemachine" 2011-07-15 14:38:04 -07:00
Chet Haase
9c56f8b528 Merge "Read font info from system config files" 2011-07-15 14:32:21 -07:00
Mathias Agopian
95a03bf3a1 Merge "dump GLES strings in SF dumpsys log" 2011-07-15 14:32:10 -07:00
Mathias Agopian
ad70186f80 dump GLES strings in SF dumpsys log
Change-Id: I438d511159b2bd915c84954f30574340017d4f47
2011-07-15 14:29:25 -07:00
Gloria Wang
5f85066ddf Merge "Use unsigned char to store table of contents retrieved from XING header. Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail." 2011-07-15 14:20:45 -07:00
Andreas Huber
cd4cc498bb Merge "Refetch playlists according to the HLS specs, varying delay if playlists unchanged" 2011-07-15 14:16:15 -07:00
John Reck
352fdfe5d1 Merge "Add a hidden generic property interface" 2011-07-15 13:18:50 -07:00
Jamie Gennis
0b7c4953a1 Merge "SurfaceTexture: fix SurfaceTextureGLToGLTest" 2011-07-15 12:35:34 -07:00
Nick Pelly
96f1959dfe am fc00b2ed: am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit 'fc00b2ed4fa64621015b47310b91e937581bd3a3':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
2011-07-15 11:20:44 -07:00
Justin Ho
bbc21229d7 Merge "Updated some effects and notifications" 2011-07-15 11:13:22 -07:00
Robert Greenwalt
3265b5178a am e1635197: am 476f5525: Small fix to 5008973 fix.
* commit 'e1635197bb6e6471b333d194855bb399da419957':
  Small fix to 5008973 fix.
2011-07-15 11:03:52 -07:00
Gilles Debunne
9cda0ece58 Merge "Removed vertical padding in PreferenceActivity header list on phones" 2011-07-15 11:03:42 -07:00
Robert Greenwalt
9c091f3d38 Merge "resolved conflicts for merge of 8550f3b8 to master" 2011-07-15 11:01:36 -07:00
Alex Sakhartchouk
af3d927e71 Merge "For the serialization context, no fifo initialization is necessary." 2011-07-15 10:57:33 -07:00
Gilles Debunne
c20cbc32f0 Merge "Bug 4382356: No automatic focus change in ScrollViews" 2011-07-15 10:55:32 -07:00
Robert Greenwalt
db36dafd72 resolved conflicts for merge of 8550f3b8 to master
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
2011-07-15 10:52:54 -07:00
Nick Pelly
5b9b4ebf78 am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '1bce9e25b6979780d849096059ef73507bdda250':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
2011-07-15 10:47:10 -07:00
Robert Greenwalt
5812538e90 am 476f5525: Small fix to 5008973 fix.
* commit '476f55253adc670d7290ad8c90b5adc9e4f58d3b':
  Small fix to 5008973 fix.
2011-07-15 10:20:48 -07:00
Fred Quintana
a94090a783 Merge "Make the KeyChain handled its own grants rather than having AccountManagerService handle them." 2011-07-15 10:10:07 -07:00
Robert Greenwalt
b4bd2daedd resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
2011-07-15 09:55:48 -07:00
Fabrice Di Meglio
9d21bedaa5 Merge "Implement textDirection heuristic selection." 2011-07-15 09:49:48 -07:00
Gilles Debunne
84f8b09038 Merge "Bug 5014726: Paste works in ExtractedText" 2011-07-15 09:41:16 -07:00
Glenn Kasten
f24e645976 Merge "Bug 5031179 possible fix for assert in join" 2011-07-15 09:23:33 -07:00
Mike Lockwood
6f81c402d5 Merge "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files" 2011-07-15 09:18:34 -07:00
Narayan Kamath
f26bfd9f2e Merge "Remove the completeAudioAvailable API." 2011-07-15 02:56:31 -07:00
Jeff Brown
922e36d70d Merge "Ensure selector state is updated when touch mode changes." 2011-07-14 22:42:15 -07:00
Jeff Brown
ab58754664 Merge "Remove edge slop support." 2011-07-14 22:32:09 -07:00
Jeff Brown
6f2d1f3ee4 Merge "Refresh the drawable state when selecting a position." 2011-07-14 22:31:40 -07:00
Jeff Brown
fd9714b3b2 Merge "ListView focus bugfix." 2011-07-14 22:31:34 -07:00
Jeff Brown
ce071667d0 Merge "Add a call to pthread_attr_destroy to avoid potential memory leaks." 2011-07-14 22:31:27 -07:00
Jeff Brown
209646dfe7 Merge "Frameworks: fixes possible invalid pointer index call." 2011-07-14 22:31:17 -07:00
Jeff Brown
e32c58acc9 Merge "Enter touch mode on ACTION_SCROLL." 2011-07-14 21:55:58 -07:00
Adam Powell
fec3b1e8e3 Merge "Fix bug 5032301 - size list menu icons appropriately." 2011-07-14 21:53:41 -07:00
Jeff Sharkey
cfb2b120ce Merge "Hide NetworkTemplate details, buffered stats I/O." 2011-07-14 21:15:49 -07:00