Justin Ho
5fd64beab3
am 58a4636f: am 6d495a67: Resized btn_radio buttons from Gingerbread for legacy apps
...
* commit '58a4636f53026f27d2551bc596c07b85db93016d':
Resized btn_radio buttons from Gingerbread for legacy apps
2011-01-21 11:01:43 -08:00
satok
90a09e0546
am 026de9ed: am 6a0d924e: Merge "Show implicitly enabled subtypes in the input method selection dialog" into honeycomb
...
* commit '026de9ed7f39c46260e7ac79dea2fcc32b151d19':
Show implicitly enabled subtypes in the input method selection dialog
2011-01-21 11:01:29 -08:00
Santosh Madhava
78e1a01479
am 10fcc6f5: am ff23e4d7: Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb
...
* commit '10fcc6f500140886d3dd9b1684c85dd2eb35061a':
Fix for issue 3370052 : Export progress percentage is incorrect
2011-01-21 11:01:06 -08:00
Santosh Madhava
d61fba526e
am f82856f3: am 95788cf4: Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ratio" into honeycomb
...
* commit 'f82856f3d206e3f3f2ef6c72d40538209e0eb659':
Fix for PR 3369866 : Project thumbnail should have the same aspect ratio
2011-01-21 11:01:01 -08:00
Shih-wei Liao
4bef1f55b9
am 602aec6b: am f1f71053: Merge "Handle fatal errors from calling bccRegisterSymbolCallback (if any)." into honeycomb
...
* commit '602aec6b5e16621fa0efc26bf328bcb3c43a28fa':
Handle fatal errors from calling bccRegisterSymbolCallback (if any).
2011-01-21 11:00:52 -08:00
Ken Wakasa
ed19b88fe2
am 6ddec8be: am ccbdf5e8: Merge "Update class doc for InputMethodSubtype" into honeycomb
...
* commit '6ddec8be1cc23f4b7e8793503420072024884072':
Update class doc for InputMethodSubtype
2011-01-21 11:00:46 -08:00
Brad Fitzpatrick
6700447200
am ca87f0e8: am 68286562: Merge "StrictMode: set sIsIdlerRegistered to false, and don\'t register if no penalties" into honeycomb
...
* commit 'ca87f0e832f71226839004c8e854e1389c037234':
StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
2011-01-21 11:00:20 -08:00
satok
6a32272af5
am d57c1fcf: am 0e5bf505: Merge "Show ime switch icon when there is a hard keyboard" into honeycomb
...
* commit 'd57c1fcf5a4f8fd9451e4a09aa50ed14c7f94ff2':
Show ime switch icon when there is a hard keyboard
2011-01-21 10:59:32 -08:00
Adam Cohen
047106d436
am f95a963e: am cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb
...
* commit 'f95a963e7313b209ab3da5eeac1bde385bca4355':
Cleaning up some StackView bad behavior
2011-01-21 10:59:20 -08:00
Romain Guy
d0417fa04e
am 8e2d489a: am 99d49118: Merge "Add support for drawBitmapMesh()." into honeycomb
...
* commit '8e2d489a868d52a979eed91a13a7605630ac997c':
Add support for drawBitmapMesh().
2011-01-21 10:59:07 -08:00
Jim Miller
252d95086a
am be71a923: am 055e56ee: Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb
...
* commit 'be71a923b084accde4c2b3ff74b2454bc6894eb6':
Fix 3374446: Allow multiple shift keys in Keyboard.
2011-01-21 10:58:58 -08:00
Adam Powell
57cb1b8f4f
am b6b47116: am 9a161b09: Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb
...
* commit 'b6b4711648d83cccebe52142c4efefaa67f4dc65':
SearchView API Review - bug 3370353 and bug 3370338
2011-01-21 10:58:45 -08:00
Scott Main
d368a35c44
am 535ad65e: am 0f805632: cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits
...
* commit '535ad65e543d724d177fb8e8175e120d571d804b':
cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits
2011-01-21 10:58:30 -08:00
Scott Main
aa99dc6543
am 244c10b0: am 77d6fcff: cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was n
...
* commit '244c10b0d879d9373a1ad4b80ae71d5a35c762ba':
cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was not updated at that time.
2011-01-21 10:58:22 -08:00
Robert Ly
dab49a65fa
am 16c0a0f6: am edc2aac7: cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4 Doc change: Updating ndk/sdk/tools overview pages for hc preview
...
* commit '16c0a0f638b845ce4f24b6124154a00707676819':
cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4 Doc change: Updating ndk/sdk/tools overview pages for hc preview
2011-01-21 10:58:13 -08:00
Stephen Hines
ee2399273b
am 536f525d: am 47171a7b: Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb
...
* commit '536f525ddb96cf751eccbd787189f34738e21a05':
Properly use Long2 for "UInt2" for FieldPacker.
2011-01-21 10:56:57 -08:00
Scott Main
91d94ea513
am 0cf6d22a: am 924e3528: Merge "docs: add getting started doc and version notes for HC preview" into honeycomb
...
* commit '0cf6d22a679aecf2d4dc589eaa7ba1e0635edfe0':
docs: add getting started doc and version notes for HC preview
2011-01-21 10:56:36 -08:00
Andreas Huber
701dc75442
am ec0c94b7: am c4f82e33: Merge "Implement missing pause/resume support for NuPlayer." into honeycomb
...
* commit 'ec0c94b7d70c1e4160e1ec57070b94d052de7eb5':
Implement missing pause/resume support for NuPlayer.
2011-01-21 10:48:25 -08:00
Scott Main
d7bfa435f5
am 437bf22d: am cfaa9c15: Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb
...
* commit '437bf22d0f177eea06a0ab8fe9e51ebe5f9bef11':
docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag
2011-01-21 10:48:16 -08:00
Dianne Hackborn
91478bbb00
am d79b8b17: am 27044f1d: Merge "Fix issue #3352125 : Crash after clearing search query" into honeycomb
...
* commit 'd79b8b173c39d7a556c6c49b42c11f7c0f56172b':
Fix issue #3352125 : Crash after clearing search query
2011-01-21 10:48:03 -08:00
Shimeng (Simon) Wang
a2d32f3c48
am 7633540c: Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb
...
* commit '7633540cf0d1cfa1f893dc827cddaca3ea272af7':
Keep min/max zoom scale in proportion when zoom density changes.
2011-01-21 10:47:35 -08:00
Shimeng (Simon) Wang
7633540cf0
Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb
2011-01-21 10:45:22 -08:00
Robert Greenwalt
27d3c5907c
Switch from NetworkUtils to netd for iface config.
...
Moving more stuff to netd and getting rid of unused NetworkUtils.
Change-Id: Ibb5a11dca58d07291fe33e6d33027553f6158ea7
2011-01-21 10:44:12 -08:00
Jesse Wilson
f3efdf5013
Move URLTest tests to libcore.
...
These tests were migrated to libcore in change ID I5a6bcdf1c03d0c36b11552ae086d0dece0440f64.
Change-Id: Idc2d8fc3681b77c9a4c19a192a202bc556a48d23
2011-01-21 10:37:19 -08:00
Huahui Wu
a586b7baaf
b/3369602 Using Math.round() to convert float coordinates to integers.
...
Change-Id: If4da01046c909667ce57a849569ae6b1acefb939
2011-01-21 10:37:09 -08:00
Gilles Debunne
e60e1e597b
Paste popup window is displayed on the side when it would be clipped on top of screen.
...
Bug 3259774
Change-Id: I6ea20452a3a235e264c91c112f52da7230657708
2011-01-21 10:34:43 -08:00
Andreas Huber
19922adceb
Some tweaks to HTTP live / nuplayer behaviour
...
- play audio-only streams again
- workaround for malformed streams that switch PIDs across bandwidths
- attempt to pick a different bandwidth stream if the previously chosen one appears
to be malformed/unsupported.
Change-Id: I426d0a40dc725aa242f619d4c9d048b69aca55c9
related-to-bug: 2368598
2011-01-21 10:34:40 -08:00
Andy Stadler
174a6fce8a
am c2ff2ec0: Merge "Read actual device encryption status" into honeycomb
...
* commit 'c2ff2ec0d987dd1372183d2a18ea59a0c4d71c2c':
Read actual device encryption status
2011-01-21 10:30:03 -08:00
Andy Stadler
c2ff2ec0d9
Merge "Read actual device encryption status" into honeycomb
2011-01-21 10:27:46 -08:00
Mathias Agopian
90b1207b6c
am 4707dc73: am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
...
* commit '4707dc73e236b7055644401b73cd30164b7ad157':
Fix the ISurfaceComposer onTransact switch.
2011-01-21 10:15:34 -08:00
Nick Pelly
11ce84fcaa
resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp
...
Change-Id: I5b510a3598adf17b738ecfe6bf8fbc47f7111350
2011-01-21 09:41:40 -08:00
Nick Pelly
df80645a97
Merge "resolved conlifcts for merge of 8c1cd157 to "honeycomb-plus-aosp"" into honeycomb-plus-aosp
2011-01-21 09:29:13 -08:00
Justin Ho
864df04442
am 50065738: Merge "Integrating btn_dialog assets from Gingerbread" into honeycomb
...
* commit '500657387d834a8eb712e9c56bb00b64173cc1a9':
Integrating btn_dialog assets from Gingerbread
2011-01-21 09:20:42 -08:00
Justin Ho
500657387d
Merge "Integrating btn_dialog assets from Gingerbread" into honeycomb
2011-01-21 09:18:17 -08:00
Justin Ho
8c4e928858
Integrating btn_dialog assets from Gingerbread
...
Change-Id: Ibcd80e649e666b611f6b5b23dfcdd5818f619131
2011-01-21 09:17:20 -08:00
Nick Pelly
8f912d1202
resolved conlifcts for merge of 8c1cd157 to "honeycomb-plus-aosp"
...
Conflicts:
api/current.xml
Change-Id: Ib6556fa54f49d4b55719dae79662d54f1530e76e
2011-01-21 08:55:38 -08:00
Amith Yamasani
04e5dcdd64
am 672f4ef3: Merge "Sync activity picker to latest dialog style." into honeycomb
...
* commit '672f4ef34801ddc788b2fe4ca41da58147ba1234':
Sync activity picker to latest dialog style.
2011-01-21 08:45:09 -08:00
Justin Ho
1fc1a381e6
am 09358f00: Integrating Gingerbread phone lockscreen assets
...
* commit '09358f00fd87cd5a9fc143a0376c228f11881fa1':
Integrating Gingerbread phone lockscreen assets
2011-01-21 08:43:08 -08:00
Amith Yamasani
672f4ef348
Merge "Sync activity picker to latest dialog style." into honeycomb
2011-01-21 08:42:18 -08:00
Justin Ho
09358f00fd
Integrating Gingerbread phone lockscreen assets
...
Change-Id: Id13942e4e516b3744d89521898c55566fd39fc35
2011-01-21 08:40:14 -08:00
Glenn Kasten
0bda68b375
Merge "Bug 3361124 Remove drmioserver"
2011-01-21 07:49:19 -08:00
Justin Ho
58a4636f53
am 6d495a67: Resized btn_radio buttons from Gingerbread for legacy apps
...
* commit '6d495a67fcf52b3c2d99443ca25e4df6bceaf07a':
Resized btn_radio buttons from Gingerbread for legacy apps
2011-01-21 07:45:43 -08:00
Justin Ho
6d495a67fc
Resized btn_radio buttons from Gingerbread for legacy apps
...
Change-Id: I1d2bef3e08e48c4a36c8311c076bdbe9fa0b3725
2011-01-21 07:40:49 -08:00
satok
026de9ed7f
am 6a0d924e: Merge "Show implicitly enabled subtypes in the input method selection dialog" into honeycomb
...
* commit '6a0d924e61cdb03ba63e06aeb950b1e21f5bf72f':
Show implicitly enabled subtypes in the input method selection dialog
2011-01-21 03:39:48 -08:00
satok
6a0d924e61
Merge "Show implicitly enabled subtypes in the input method selection dialog" into honeycomb
2011-01-21 03:37:49 -08:00
satok
bb4aa0683c
Show implicitly enabled subtypes in the input method selection dialog
...
bug: 3367646
Change-Id: I9550f17f163950d80113fbcb8c9dd8a7d014cf6a
2011-01-21 20:20:02 +09:00
Santosh Madhava
10fcc6f500
am ff23e4d7: Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb
...
* commit 'ff23e4d7f872df4d5880e69cc3742fc08d66f00b':
Fix for issue 3370052 : Export progress percentage is incorrect
2011-01-20 23:46:27 -08:00
Santosh Madhava
f82856f3d2
am 95788cf4: Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ratio" into honeycomb
...
* commit '95788cf478d177d6748c40d4ce725fb4f93aec82':
Fix for PR 3369866 : Project thumbnail should have the same aspect ratio
2011-01-20 23:46:23 -08:00
Santosh Madhava
ff23e4d7f8
Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb
2011-01-20 23:44:29 -08:00
Santosh Madhava
95788cf478
Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ratio" into honeycomb
2011-01-20 23:44:05 -08:00