Teng-Hui Zhu
ccd0789d9d
am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
...
* commit 'b25181aaccb00fee405251bf3575ce1d40badf46':
Fix the issue the video can't start to play
2011-04-07 09:07:52 -07:00
Teng-Hui Zhu
decffc4e2f
Merge "Fix the issue the video can't start to play" into honeycomb-mr1
2011-04-07 08:52:45 -07:00
Joe Onorato
03218c08ba
Merge changes I4011db5c,I622bc5fa
...
* changes:
less logging
A system setting for "advanced settings."
2011-04-06 18:45:14 -07:00
Wink Saville
baa1aa6667
am 004da7e2: am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
...
* commit '004da7e2e0287cdad63a9009841309d45f038787':
Add getCdmaSubscriptionSource to CommandsInterface.
2011-04-06 17:56:55 -07:00
Wink Saville
4228900c55
am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
...
* commit '1b87f1db89e82d00445a43c4593d8c5ea5d2633f':
Add getCdmaSubscriptionSource to CommandsInterface.
2011-04-06 17:54:11 -07:00
Wink Saville
089001ae89
Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
2011-04-06 17:52:22 -07:00
Roman Nurik
0bd11eb47c
am 2059bdf3: am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
...
* commit '2059bdf34793dc75448e5cb6201db6c49a3a8e18':
Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.
2011-04-06 17:29:06 -07:00
Roman Nurik
454871f386
am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
...
* commit 'e2b81c3e886e47f00d54426ca82c66c6f56bc5b1':
Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.
2011-04-06 17:25:08 -07:00
Jeff Brown
68772ad1fd
Merge "Allow batching samples onto the pending motion event."
2011-04-06 17:22:26 -07:00
Roman Nurik
80f3f06f5d
am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
...
* commit 'b17cc8a83fd819efcb79d78d005e16b3f04d08df':
Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.
2011-04-06 17:21:21 -07:00
Roman Nurik
5bc3c5838a
Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
2011-04-06 17:18:47 -07:00
Gilles Debunne
a72a70441b
Merge "Word suggestion popup added to EditText."
2011-04-06 17:07:27 -07:00
Michael Kolb
da01d6ebcf
Merge "invalidate WebView after Title change"
2011-04-06 16:47:34 -07:00
Jeff Brown
bd20a4d8e3
Merge "Minor Alt-TAB / Recent Apps Dialog improvements."
2011-04-06 15:57:21 -07:00
Jaikumar Ganesh
2960cf4467
Merge "Check if BT is disabled or not when sending audio state."
2011-04-06 15:39:20 -07:00
James Dong
c1babef236
Merge "Handle the failure from GetStringUTFChars()"
2011-04-06 15:26:48 -07:00
Matthew Xie
753730816d
Merge "Set service priority of A2DP and Headset from BluetoothService via IPC call"
2011-04-06 15:26:23 -07:00
Jean-Michel Trivi
1ffb71b275
Merge "Bug 4231349 fix error in javadoc for android.media.MediaPlayer"
2011-04-06 14:46:17 -07:00
Eric Fischer
d01e8ab25a
am bef09dc0: (-s ours) am ad3bddab: am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'bef09dc022a57e535232890302ffb5e9c02b7a6a':
Import revised translations. DO NOT MERGE
2011-04-06 14:18:45 -07:00
Eric Fischer
f68b3714a8
am ad3bddab: am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'ad3bddab9246933971ff1b5360b0915e55579fe7':
Import revised translations. DO NOT MERGE
2011-04-06 14:16:12 -07:00
Eric Fischer
b34190ad51
am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '9f2f650f26941a7cd4931afc66f39918e7c2817c':
Import revised translations. DO NOT MERGE
2011-04-06 14:12:31 -07:00
Eric Fischer
e40981d31f
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-04-06 14:09:32 -07:00
Bill Gruber
1ea9733536
am 3e46ee4b: am 2811358f: am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
...
* commit '3e46ee4b5cf6103f5d3fe59a486e82c7c6600bb8':
IAB docs: fixes line break issues
2011-04-06 14:09:01 -07:00
Bill Gruber
cd5b479d7c
am 2811358f: am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
...
* commit '2811358f68e6f31c44f483e196f1c91692febf50':
IAB docs: fixes line break issues
2011-04-06 14:04:47 -07:00
Joe Onorato
02e06ea9f7
Merge "more targeted logging"
2011-04-06 13:58:57 -07:00
Bill Gruber
a177f16b19
am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
...
* commit '3bd373079ed2599e5e07aa1cf702c7f8386765c3':
IAB docs: fixes line break issues
2011-04-06 13:58:34 -07:00
Adam Cohen
c0c3dbd785
Merge "Fixing AdapterViewAnimator onItemClick compatibility"
2011-04-06 13:40:24 -07:00
Bill Gruber
f206d444f8
am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
...
* commit '48a1b52bc736acfe9c4723abf6db7c8befc5e43b':
IAB docs: fixes line break issues
2011-04-06 13:20:27 -07:00
Xavier Ducrohet
0f242c8111
am d7765e35: am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode.
...
* commit 'd7765e353cdc6f0bb4156841a8436ea28eb20eea':
LayoutLib: Fix issue with rendering mode.
2011-04-06 13:19:57 -07:00
Glenn Kasten
733c9dc3bd
Merge "Miscellaneous code cleanup in audio framework"
2011-04-06 13:03:11 -07:00
Bill Gruber
19b7ed0865
Merge "IAB docs: fixes line break issues" into honeycomb
2011-04-06 12:52:41 -07:00
Xavier Ducrohet
cded00b270
am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode.
...
* commit '73dc2602898a300306ad418ca5bec990f0de877f':
LayoutLib: Fix issue with rendering mode.
2011-04-06 12:50:01 -07:00
Xavier Ducrohet
16045d820f
am c5aeac7f: LayoutLib: Fix issue with rendering mode.
...
* commit 'c5aeac7f157e3cb9e29ab8c126f74e26493501f5':
LayoutLib: Fix issue with rendering mode.
2011-04-06 12:41:17 -07:00
Mathias Agopian
b561dd29b5
Merge "remove more unused references to ISurface"
2011-04-06 12:22:29 -07:00
Mathias Agopian
7104bf7d8d
Merge "Remove unused references to ISurface"
2011-04-06 12:22:01 -07:00
Joe Onorato
8be410a9dd
Merge "turn off log spew"
2011-04-06 12:04:35 -07:00
Joe Onorato
64c13342a6
Merge "Move around the HDMI switch detection so we don't try to get the status if we can't listen to it."
2011-04-06 12:04:24 -07:00
Jason Sams
b45c7e8e19
Merge "Cleanup character limits."
2011-04-06 11:45:42 -07:00
Jason Sams
39962a1476
Merge "Seperate ProgramRaster. Cleanup ProgramRaster and ProgramStore creation."
2011-04-06 11:40:33 -07:00
Jason Sams
4ca92efc3e
Merge "Seperate GL from RS program store."
2011-04-06 11:30:24 -07:00
Dianne Hackborn
592e3fc150
Add new resource configurations for screen width/height in "dp".
...
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.
This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.
Change-Id: I22f8afa136b4f274423978c570fa7c9855040496
2011-04-06 11:00:37 -07:00
Brian Carlstrom
b76dd6c566
Merge "Don't use local ref for cached jclass reference in JNI code"
2011-04-06 10:06:00 -07:00
Irfan Sheriff
6928debdc8
Merge "Add support for supplicant SCAN_INTERVAL"
2011-04-06 09:16:26 -07:00
Mathias Agopian
47d8730a24
remove more unused references to ISurface
...
Change-Id: I2201f1ca2bb8f203a081d94a0134f798778dfbef
2011-04-05 20:11:55 -07:00
Fabrice Di Meglio
9121ad8643
Merge "TextLayoutCache - more code refactoring"
2011-04-05 15:38:06 -07:00
Brian Carlstrom
f34d4f455c
Merge "Fix usages of PopLocalFrame to include returned local reference"
2011-04-05 15:26:04 -07:00
Scott Main
25f445f9d0
am 6bb507e9: am c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
...
* commit '6bb507e9ebdaff0370b2826f9a4a73156997c498':
docs: fix the TOC in a few docs
2011-04-05 14:35:37 -07:00
Scott Main
27f58106ef
am c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
...
* commit 'c70d483f4baffe5cb4ba09df3645aa6a1b351431':
docs: fix the TOC in a few docs
2011-04-05 14:32:15 -07:00
Scott Main
fc182c2c9a
am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
...
* commit 'e4cafabbcc4b69479217d1a167926b79c37e5ded':
docs: fix the TOC in a few docs
2011-04-05 14:28:23 -07:00
Fabrice Di Meglio
e3b66f3a6c
Merge "Code refactoring for TextLayoutCache"
2011-04-05 14:23:23 -07:00