Commit Graph

39669 Commits

Author SHA1 Message Date
John Wang
41a676f7ad Merge "Support selectNetworkManually in LTEPhone." into ics-mr0 2011-10-12 15:34:56 -07:00
Robert Ly
b6fa91e794 am a9a21c2a: (-s ours) Merge "DO NOT MERGE cherrypick from master docs: changes to toc for RS, graphics, and animation Change-Id: I542ac4cda24907ba0df4d63e5d7b4047e8091215" into ics-mr0
* commit 'a9a21c2aa900fe63c4e9ccce4d62387d921a4b74':
  DO NOT MERGE cherrypick from master docs: changes to toc for RS, graphics, and animation Change-Id: I542ac4cda24907ba0df4d63e5d7b4047e8091215
2011-10-12 15:34:28 -07:00
Justin Ho
9a85152891 Merge "Updated list selectors Bug: 5450396" into ics-mr0 2011-10-12 15:33:49 -07:00
Robert Ly
9b0f91a0b7 Merge "DO NOT MERGE cherrypick from master docs: changes to toc for RS, graphics, and animation Change-Id: I542ac4cda24907ba0df4d63e5d7b4047e8091215" into ics-mr0 2011-10-12 15:32:38 -07:00
Robert Ly
ede3ea88d9 am 83b740ab: (-s ours) Merge "DO NOT MERGE cherrypick from master docs: restructure graphics docs and add hw-acceleration docs change-Id: I0f6288d1aa5430794ac672324c3e0fc7b714455d" into ics-mr0
* commit '83b740ab1e1de378edfd4d2f78c8f2a7f7ce810a':
  DO NOT MERGE cherrypick from master docs: restructure graphics docs and add hw-acceleration docs change-Id: I0f6288d1aa5430794ac672324c3e0fc7b714455d
2011-10-12 15:08:49 -07:00
Robert Ly
f95135789d am 0f7e4e8e: (-s ours) Merge "DO NOT MERGE cherrypick from master" into ics-mr0
* commit '0f7e4e8e937c4d69ec1742fc03a1a5775bfa2877':
  DO NOT MERGE cherrypick from master
2011-10-12 15:06:51 -07:00
Robert Ly
549e692672 Merge "DO NOT MERGE cherrypick from master docs: restructure graphics docs and add hw-acceleration docs change-Id: I0f6288d1aa5430794ac672324c3e0fc7b714455d" into ics-mr0 2011-10-12 15:05:26 -07:00
Robert Ly
c5e6d47735 Merge "DO NOT MERGE cherrypick from master" into ics-mr0 2011-10-12 15:05:01 -07:00
Fred Quintana
490c912ccd Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely" 2011-10-12 14:53:34 -07:00
Jeff Brown
ee23198cdc Merge "Improve screenshot chord debouncing. Bug: 5011907" 2011-10-12 14:49:57 -07:00
Joe Fernandez
d16b0945e2 am 99b70f3f: (-s ours) DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29
* commit '99b70f3f5d051261229d1792c169a374fc23326b':
  DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29
2011-10-12 14:39:58 -07:00
Romain Guy
5e412a0f7d Merge "Add missing public native API" 2011-10-12 14:12:22 -07:00
Andreas Huber
711e90898b am 8c7951af: Merge "Assume a PTS of 0 if absent, don\'t bail on fragmented PES packets not having PTS" into ics-mr0
* commit '8c7951afa28ffa08efe3c920db364788a0968f94':
  Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS
2011-10-12 13:52:21 -07:00
Andreas Huber
4336560726 Merge "Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS" into ics-mr0 2011-10-12 13:51:05 -07:00
Romain Guy
0d602e072c Merge "Reduce the size of libhwui by 50%" 2011-10-12 13:50:11 -07:00
Romain Guy
5c78b6861f Reduce the size of libhwui by 50%
This change removes unnessary symbols. All symbols are hidden by
default, public APIs with exported symbols are explicitly marked
with ANDROID_API.

Change-Id: I692fde432a86c12108de1cfd1f6504919a7d5f3f
2011-10-12 13:48:51 -07:00
RoboErik
a6fb75d896 Merge "Fix immenent build breakage." 2011-10-12 13:45:12 -07:00
RoboErik
13745c7e74 Merge "Add hidden API to prepare for increasing calendar support" 2011-10-12 13:29:34 -07:00
Jason Sams
0f5cda8ee6 Merge "Fix example code." 2011-10-12 13:20:22 -07:00
Daniel Sandler
558781f548 am fd8f6f2f: Merge "Fix obsolete Honeycomb platlogo." into ics-mr0
* commit 'fd8f6f2f7557c414466f7634391821e59c1ce040':
  Fix obsolete Honeycomb platlogo.
2011-10-12 13:12:37 -07:00
Daniel Sandler
e815c90662 Merge "Fix obsolete Honeycomb platlogo." into ics-mr0 2011-10-12 13:11:13 -07:00
Jamie Gennis
951491f897 am 075e4c3d: Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0
* commit '075e4c3d2e6a8a9eb3506dfedc8da938fb65fb65':
  SurfaceFlinger: update orientation via transactions
2011-10-12 13:04:36 -07:00
Jamie Gennis
a799380eea Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0 2011-10-12 13:03:11 -07:00
Joe Fernandez
935c4720d4 Merge "docs: Camera API Developer Guide" 2011-10-12 12:49:47 -07:00
Fabrice Di Meglio
6882f23a3d am 87228cd7: Merge "Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0
* commit '87228cd7bb9a39e2bb33a767d214c8d834f840df':
  Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned
2011-10-12 12:42:12 -07:00
Fabrice Di Meglio
83640db813 Merge "Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0 2011-10-12 12:39:55 -07:00
Adam Powell
70ef460a89 am f2894659: Fix bug 5449931 - Wrong theme for icon menus
* commit 'f2894659e8df625783afcd3fa17462ab23d29145':
  Fix bug 5449931 - Wrong theme for icon menus
2011-10-12 12:26:42 -07:00
Jason Sams
20ba83bb22 Merge "Improve rsForEach overhead." 2011-10-12 12:20:04 -07:00
Robert Ly
87b355666f Merge "docs: changes to toc for RS, graphics, and animation" 2011-10-12 12:05:49 -07:00
Scott Main
01fd593210 am c2916535: Merge "docs: add Fujitsu USB info bug 5427262" into ics-mr0
* commit 'c291653539fd0a8b6b73a1174aa80afdb62272e5':
  docs: add Fujitsu USB info bug 5427262
2011-10-12 12:00:40 -07:00
Scott Main
146bd2be0c Merge "docs: add Fujitsu USB info bug 5427262" into ics-mr0 2011-10-12 11:19:17 -07:00
Peter Ng
4d8e869892 Merge "darker notification press state and divider" 2011-10-12 11:15:29 -07:00
Eino-Ville Talvala
d1cc9ad00c am 0a273592: Merge "Add video stabilization control to Camera parameters." into ics-mr0
* commit '0a2735928030229b3340074eb11c2423342fda93':
  Add video stabilization control to Camera parameters.
2011-10-12 10:40:11 -07:00
Eino-Ville Talvala
878407ef19 Merge "Add video stabilization control to Camera parameters." into ics-mr0 2011-10-12 10:37:57 -07:00
Amith Yamasani
94eeada651 am 421648ed: (-s ours) Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0
* commit '421648ed06a2c944bc6a5fa866d461761533005b':
  Backup owner info as part of settings backup. DO NOT MERGE.
2011-10-12 10:00:54 -07:00
Steve Block
24d970553f am c0c394ee: Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0
* commit 'c0c394ee053c1b62da58247c431c20d5939c4ada':
  Modify BrowserFrame.requestClientCert() to take the host and port as a String
2011-10-12 10:00:48 -07:00
Amith Yamasani
f29340482b Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0 2011-10-12 09:59:11 -07:00
Steve Block
0a267f2f8a Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0 2011-10-12 09:58:25 -07:00
Gilles Debunne
4c33aed7e8 Merge "Bug 5385279: IOOB in createMisspelledSuggestionSpan" 2011-10-12 09:51:17 -07:00
Gilles Debunne
94ae1ea1d4 Merge "Bug 5237623: word no longer underlined after replacement" 2011-10-12 09:50:45 -07:00
Robert Ly
5278f41d50 Merge "docs: restructure animation and add container doc" 2011-10-12 09:50:31 -07:00
Robert Ly
5a3acd38a4 Merge "docs: restructure graphics docs and add hw-acceleration docs" 2011-10-12 09:50:26 -07:00
Amith Yamasani
475ad8237d Merge "Backup owner info as part of settings backup." 2011-10-12 09:45:22 -07:00
Jean-Michel Trivi
793a6a9a7a am 49f61439: (-s ours) Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0
* commit '49f61439db7f8960745b0a5664795b5a5ad31ef8':
  DO NOT MERGE Fix 5389442 RemoteControlClient javadoc
2011-10-12 09:42:48 -07:00
Jean-Michel Trivi
0a08f22bd8 Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0 2011-10-12 09:40:17 -07:00
Jake Hamby
d43ee6bad6 am 34877877: Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0
* commit '34877877bb563e7e20600e6777cca4dc358a12d9':
  Fix bug in CDMA WDP datagram handling (fixes incoming MMS).
2011-10-12 01:21:34 -07:00
Jake Hamby
fde5f38b4d Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0 2011-10-12 01:10:28 -07:00
Adam Powell
2b60ce2f6f am 35af3639: Merge "Fix bug 5173029 - make fast scroller aware of scrolling containers" into ics-mr0
* commit '35af3639a169b1b8e5f4d96579795e5480080b52':
  Fix bug 5173029 - make fast scroller aware of scrolling containers
2011-10-11 19:33:29 -07:00
Adam Powell
f9623049dc Merge "Fix bug 5173029 - make fast scroller aware of scrolling containers" into ics-mr0 2011-10-11 19:30:08 -07:00
Svetoslav Ganov
998bac2750 am 52763734: Merge "Dragging in touch explore mode should not become exploring." into ics-mr0
* commit '5276373430af24448324941af6b911d90a3ddd10':
  Dragging in touch explore mode should not become exploring.
2011-10-11 18:41:05 -07:00