Andreas Huber
b93dfa61a4
am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
...
* commit 'cd6828e84220c6bdf92bbca12fcd88a8da76387c':
DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
2011-02-25 15:43:07 -08:00
Andreas Huber
cd6828e842
am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
...
* commit '2332cd8c675628f3bdd6e46a8dd6da639bd7f76e':
DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
2011-02-25 15:38:06 -08:00
Andreas Huber
2332cd8c67
Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
2011-02-25 15:33:28 -08:00
Adam Cohen
54a351ed62
Merge "Adding framework support for resizable widgets"
2011-02-25 15:28:29 -08:00
Robert Greenwalt
7532d9972c
Merge "Fixing the write of BackgroundData setting."
2011-02-25 15:20:30 -08:00
Christopher Tate
e2ed9562fc
Revert "Binder linkage no longer depends on JNI objrefs as persistent tokens"
...
This reverts commit c2d55dd897 .
2011-02-25 15:18:53 -08:00
Winson Chung
04ee429e89
Merge "Fixing build"
2011-02-25 15:17:17 -08:00
Winson Chung
22bc69de50
Fixing build
...
Change-Id: I3d60c115190a6e478777229d4851dedc78111c39
2011-02-25 15:14:40 -08:00
Adam Cohen
d2e20de64b
Adding framework support for resizable widgets
...
-> Added resizeMode to the widget xml
-> Fixed an unexposed bug in AppWidgetHost where
minWidth and minHeight were never being converted
from complex type to dp
Change-Id: Ibbc4fc6542d095623ac2a40694b6a3dbfeb279ad
2011-02-25 15:10:40 -08:00
Alex Sakhartchouk
45b1adf947
Merge "Moving dependency includes out of librs headers."
2011-02-25 14:53:34 -08:00
Winson Chung
541466f6d6
Merge "Fixing issue where RemoteViewsService.onDestroy() was never being called."
2011-02-25 14:30:37 -08:00
Xavier Ducrohet
75321ebf79
Merge "LayoutLib: fix incorrect indices in one of the 2 native_drawTextRun methods."
2011-02-25 14:28:20 -08:00
Jaikumar Ganesh
63a2e62a39
Merge "Unset device trust state before unpairing."
2011-02-25 14:25:16 -08:00
Jaikumar Ganesh
cc2c06656c
Unset device trust state before unpairing.
...
a) Device is trusted.
b) Device is unpaired.
c) We need to set the trusted value before unpairing.
Else on the next pairing, the device will be trusted automatically
and we will not show the PBAP authentication dialog.
Change-Id: I8d7c962688885885d37be341e5494069294eb392
2011-02-25 14:16:27 -08:00
Winson Chung
84bbb02021
Fixing issue where RemoteViewsService.onDestroy() was never being called.
...
Change-Id: I15ad04eee18bc3e09d4846c7f2f2d2d8d168e518
2011-02-25 14:06:47 -08:00
Gilles Debunne
0277c17128
Merge "Code clean-up around ScrollView."
2011-02-25 13:48:19 -08:00
Gilles Debunne
05b5590281
Merge "Removed ViewTreeObserver in TextView when handles are hidden"
2011-02-25 13:47:37 -08:00
Robert Greenwalt
db4afae70a
Fixing the write of BackgroundData setting.
...
I outsmarted myself trying to minimize writes and caused no writes to occur.
bug:3485934
Change-Id: I292e6837d29903a21abb6e001d25d96a4cdc18ec
2011-02-25 13:44:09 -08:00
David Li
4368c449d7
Merge "Fix mTexCoordsSlot > 0 check to mTexCoordsSlot >= 0"
2011-02-25 12:59:14 -08:00
Samyeoul Choi
4b7c6fa2c0
am 350799b7: am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
...
* commit '350799b72c3180e04ec91469509f6079c932b971':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:55:35 -08:00
Samyeoul Choi
350799b72c
am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
...
* commit '6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:51:51 -08:00
Svetoslav Ganov
bc006dc0aa
am dc365a36: Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit 'dc365a36dac50bccc1411c37839513daec56d335':
Use different version of CLDR data in DatePicker
2011-02-25 12:45:53 -08:00
Svetoslav Ganov
dc365a36da
Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-02-25 12:40:57 -08:00
Svetoslav Ganov
f114809031
resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp
...
Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6
2011-02-25 12:39:59 -08:00
Samyeoul Choi
6c5d9a0622
am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
...
* commit '092238916fd5d10090c0bcad33644778a1f366e7':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:08:08 -08:00
David Li
cf28957c89
Fix mTexCoordsSlot > 0 check to mTexCoordsSlot >= 0
...
0 Is a valid attribute location.
Change-Id: Ib24335f48efd6cc59e2ab877569d7d0c95f8490a
Signed-off-by: David Li <davidxli@google.com >
2011-02-25 12:05:44 -08:00
James Dong
097d3a4729
Merge "mp4a box contains mp3 audio when the object type indication is 0x6b"
2011-02-25 11:52:14 -08:00
Eric Fischer
0805d104cc
Merge "Import revised translations."
2011-02-25 11:48:14 -08:00
Eric Fischer
a1a71260b7
Import revised translations.
...
Change-Id: I15bff66ef87f6c0b0ac381b18f1b98a9ed05f560
2011-02-25 11:30:10 -08:00
Samyeoul Choi
092238916f
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
...
'*86' which is set now as a default at CDMAPhone.java,
is default voicemail number for Verizon.
For Sprint, we use user's own number for voicemail.
So we add codes in CDMAPhone.java to use
'config_telephony_use_own_number_for_voicemail',
and use config.xml to set this value as false.
Then we overlay Sprint's own config.xml file to
override 'config_telephony_use_own_number_for_voicemail' as a true.
Change-Id: I110914bdfa9a79aaba89d3b80edbcf044e9aabee
2011-02-25 11:28:43 -08:00
Eric Fischer
e4865c438e
am 040f6150: (-s ours) am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '040f61504aeab1d905ac9fb85945699877e78d4e':
Import revised translations. DO NOT MERGE
2011-02-25 11:26:13 -08:00
James Dong
e883d317d5
mp4a box contains mp3 audio when the object type indication is 0x6b
...
In this case, the MediaExtractor returns ERROR_UNSUPPORTED since our
software MP3 audio decoder may not be able to handle packetized
MP3 audio.
bug - 3377570
Change-Id: I8bb6b3813716b5fa019e318842e8e1908b3c8bf8
2011-02-25 11:19:40 -08:00
Eric Fischer
040f61504a
am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '9967ce04572e916a5f68ae0f9345f13b35ec20b0':
Import revised translations. DO NOT MERGE
2011-02-25 11:11:13 -08:00
Gilles Debunne
2ed2eacd7e
Code clean-up around ScrollView.
...
Change-Id: Ia110f30279a93c96741e9afbd93ed6231aa97ef1
2011-02-25 11:01:49 -08:00
Gilles Debunne
b7012e841c
Removed ViewTreeObserver in TextView when handles are hidden
...
terminate method is no longer needed since handles are popupWindow
which have their own fade-out animations.
Change-Id: I8354f78ece2ffe9c098ef2f02f0d637fc4c813c0
2011-02-25 11:00:11 -08:00
Eric Fischer
9967ce0457
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-02-25 10:54:34 -08:00
Eric Fischer
0484786af7
Import revised translations. DO NOT MERGE
...
Change-Id: I75f16cb4c3d9a4caa1234a86fbba9cae6799d180
2011-02-25 10:47:43 -08:00
Shimeng (Simon) Wang
56d9353195
Merge "Make sure pinch zoom and overview scale are within limits"
2011-02-25 10:37:33 -08:00
Alex Sakhartchouk
ebd65bbb84
Moving dependency includes out of librs headers.
...
When we want to use it on the host, we shouldn't need to go hunting for every external dependency
Change-Id: I885262acdcdf5ede4a9392235f35d5e2f7038e8b
2011-02-25 09:34:33 -08:00
Andreas Huber
06572b9abd
DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
...
Squashed commit of the following:
commit b1732e9b8bfea4c99bd07907c9aac9fcf1e8b264
Author: Andreas Huber <andih@google.com >
Date: Thu Feb 24 12:05:40 2011 -0800
DO NOT MERGE: Alternate patch for late video issue: seek only the video ahead to the next
syncframe after the current audio media position, leave audio untouched.
Change-Id: I4f6eb4e577147bc12ed2e998bea299f4bcfaf936
related-to-bug: 3375737
commit 5e7282cf0b5c7a613da5e65fd6c8cb33a1058f8e
Author: Andreas Huber <andih@google.com >
Date: Fri Feb 11 13:09:36 2011 -0800
DO NOT MERGE: Start playing (and decoding) audio only after the first video frame has been decoded.
if there's both audio and video content. This gives the video decoder an opportunity
to fill its internal buffer queue at the start of playback.
Change-Id: If17c4243546b1c27c8e5ee43941654d0e36f5ee5
related-to-bug: 3431702
Change-Id: Ic3a6be467ff7ad09da04b1d2bb1a692ee38002b4
2011-02-25 09:13:53 -08:00
Vasu Nori
7ad9eb69c4
Merge "bug:3467948 if byteArray couldn't be allocated for blob, throw exception"
2011-02-25 08:57:59 -08:00
Vasu Nori
e6044145bc
bug:3467948 if byteArray couldn't be allocated for blob, throw exception
...
Change-Id: I73e36c10f31086ea567debad536350316b2df67f
2011-02-25 08:56:07 -08:00
Leon Scroggins
675ad891b6
Merge "Comment clean up."
2011-02-25 08:21:23 -08:00
Leon Scroggins
31cb0bedc6
Comment clean up.
...
Bug:3405773
Change-Id: I225cccc637dd0652af2ce58072beac32e56088c7
2011-02-25 10:53:50 -05:00
Chet Haase
a00f3865f5
Add ViewPropertyAnimator for easy animation of View properties
...
Change-Id: I2bc52ca16507d8d20004d2d6823e587791272aac
2011-02-25 06:47:53 -08:00
Peter Visontay
11f4ae76f0
Removed launch count increase API from Applications.
...
Bug: 3431684
Change-Id: I5bcf8fc6c917cc0ec60302a6c994e4e47b77c357
2011-02-25 12:37:33 +00:00
Wu-cheng Li
0c74819b76
Merge "Improve camera getSupportedPreviewFormats javadoc."
2011-02-25 01:36:56 -08:00
Svetoslav Ganov
66edf2bb3f
am 9e5b1a49: Merge "Use different version of CLDR data in DatePicker" into gingerbread
...
* commit '9e5b1a49022d08aee8653fd34f3a8cd878618aa5':
Use different version of CLDR data in DatePicker
2011-02-25 00:09:03 -08:00
Svetoslav Ganov
9e5b1a4902
Merge "Use different version of CLDR data in DatePicker" into gingerbread
2011-02-24 23:56:52 -08:00
Wink Saville
ee4d1a6708
Merge "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-02-24 22:08:41 -08:00