Andreas Huber
eb763a7b02
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
8c7951afa2
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
19de9efcc4
Merge "Reduce the size of libhwui by 50%"
2011-10-12 13:50:11 -07:00
Romain Guy
7953745dd5
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
dc8f43294a
Merge "Fix immenent build breakage."
2011-10-12 13:45:12 -07:00
RoboErik
fced9521be
Fix immenent build breakage.
...
Change-Id: Iad7b68f1e16d4ba781fa45f467cb59c73a6ff26d
2011-10-12 13:43:56 -07:00
Adam Powell
0060f8bf63
Fix bug 5449931 - Wrong theme for icon menus
...
IconMenuPresenter should always use its own theme for the system
inflater.
Change-Id: Iacadce37d62a60cdf6220d82f1178098ed92d51e
2011-10-12 13:29:59 -07:00
RoboErik
3db295cd7e
Merge "Add hidden API to prepare for increasing calendar support"
2011-10-12 13:29:34 -07:00
RoboErik
f8143c5d07
Add hidden API to prepare for increasing calendar support
...
This adds hidden APIs for supporting settng allowed availabilities and
attendee types, adding the tentative availability and resource
attendee type, color indexes for calendars and events, and a colors
table.
b/5317399 b/5309787 b/5207781 b/5347210
Change-Id: I8dec4d0ebb0523b34bd420a0ab62bf5d0650996f
2011-10-12 13:27:44 -07:00
Jason Sams
99ea2f6962
Merge "Fix example code."
2011-10-12 13:20:22 -07:00
Jason Sams
38b78b1bf5
Fix example code.
...
Change-Id: Idd45125940be2e3c50f60c8ac1894838821f3123
2011-10-12 13:19:14 -07:00
Daniel Sandler
3c07f7f0d6
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
fd8f6f2f75
Merge "Fix obsolete Honeycomb platlogo." into ics-mr0
2011-10-12 13:11:13 -07:00
Jamie Gennis
c2091130ae
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
075e4c3d2e
Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0
2011-10-12 13:03:11 -07:00
Joe Fernandez
485bc55438
Merge "docs: Camera API Developer Guide"
2011-10-12 12:49:47 -07:00
Fabrice Di Meglio
cee057ed2d
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
87228cd7bb
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
75c00531ec
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
678f8ccb3e
Merge "Improve rsForEach overhead."
2011-10-12 12:20:04 -07:00
Andreas Huber
33d94067ad
Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS
...
Change-Id: I3b31f08428fb7195b98f145ae0675006c8756de1
related-to-bug: 5450187
2011-10-12 12:14:23 -07:00
Adam Powell
f2894659e8
Fix bug 5449931 - Wrong theme for icon menus
...
IconMenuPresenter should always use its own theme for the system
inflater.
Change-Id: Iacadce37d62a60cdf6220d82f1178098ed92d51e
2011-10-12 12:13:45 -07:00
Robert Ly
8f57a81907
Merge "docs: changes to toc for RS, graphics, and animation"
2011-10-12 12:05:49 -07:00
Scott Main
c7426ca962
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
Fabrice Di Meglio
9f51384720
Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned
...
- this was a regression introduced when dealing with getLayoutAlignment()
Change-Id: I9571a7976789b768c7cb41560d88b35d67ae3895
2011-10-12 11:43:27 -07:00
Scott Main
c291653539
Merge "docs: add Fujitsu USB info bug 5427262" into ics-mr0
2011-10-12 11:19:17 -07:00
Peter Ng
6c5cbeddb3
Merge "darker notification press state and divider"
2011-10-12 11:15:29 -07:00
Joe Fernandez
6d78639868
docs: Camera API Developer Guide
...
Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29
2011-10-12 11:14:43 -07:00
Wink Saville
63bbd8d32e
Set roaming indicator to off if Perferred Roaming List is not loaded.
...
Bug: 5326176
Change-Id: I5cfef7df5b7ee0bad97425dcbe4c98b6127c2065
2011-10-12 10:51:41 -07:00
Eino-Ville Talvala
ca2640b2ab
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
0a27359280
Merge "Add video stabilization control to Camera parameters." into ics-mr0
2011-10-12 10:37:57 -07:00
Eino-Ville Talvala
037abb8bb0
Add video stabilization control to Camera parameters.
...
Hardware video stabilization reduces camera shake in preview
and in recorded videos. It has no effect on still image capture.
Convenience accessor methods hidden for now.
Change-Id: Ie18450bff662b2ef98b85d19719beefc180975fc
2011-10-12 10:34:10 -07:00
Robert Ly
e987c021ab
docs: changes to toc for RS, graphics, and animation
...
Change-Id: I542ac4cda24907ba0df4d63e5d7b4047e8091215
2011-10-12 10:05:29 -07:00
Amith Yamasani
120c48aab8
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
ca731c5c6b
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
421648ed06
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
c0c394ee05
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
b10d396f2e
Merge "Bug 5385279: IOOB in createMisspelledSuggestionSpan"
2011-10-12 09:51:17 -07:00
Gilles Debunne
ba25c01335
Merge "Bug 5237623: word no longer underlined after replacement"
2011-10-12 09:50:45 -07:00
Robert Ly
cde59f2fdd
Merge "docs: restructure animation and add container doc"
2011-10-12 09:50:31 -07:00
Robert Ly
c37bfc3f92
Merge "docs: restructure graphics docs and add hw-acceleration docs"
2011-10-12 09:50:26 -07:00
Amith Yamasani
aee2687e61
Backup owner info as part of settings backup. DO NOT MERGE.
...
[Cherry pick from master]
Added these settings to the whitelist:
Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED
Settings.Secure.LOCK_SCREEN_OWNER_INFO
Bug: 5342797
Change-Id: I1bd4d04b5651b61919efd8c1b25c04acc5806f4a
2011-10-12 09:46:43 -07:00
Amith Yamasani
50f9924322
Merge "Backup owner info as part of settings backup."
2011-10-12 09:45:22 -07:00
Jean-Michel Trivi
b5d9176d3b
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
49f61439db
Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0
2011-10-12 09:40:17 -07:00
Scott Main
5beb7a5a7c
docs: add Fujitsu USB info
...
bug 5427262
Change-Id: Ia3694c8cf94cc1bba140379eb1745daa9f66ec2c
2011-10-12 09:35:18 -07:00
Daniel Sandler
5f839f8ee4
Fix obsolete Honeycomb platlogo.
...
Bug: 5438131
Change-Id: I848bcc8e4d6cdd28c1ffaa08b7fcceb87242932a
2011-10-12 10:48:05 -04:00
Steve Block
8eb83b96ac
Modify BrowserFrame.requestClientCert() to take the host and port as a String
...
Currently we get the host and port from Chromium as a std::string, convert to a
jbyte array to pass over JNI, then convert to String. It's simpler to convert
directly to jstring and to pass that over JNI.
Requires https://android-git.corp.google.com/g/141234
in external/webkit.
Bug: 5442710
Change-Id: I5480471a841c24481ef09d836a8b0c778251b119
2011-10-12 09:51:22 +01:00
Jake Hamby
5903301304
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
34877877bb
Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0
2011-10-12 01:10:28 -07:00