Jean-Baptiste Queru
a4130babac
resolved conflicts for merge of bf1439c5 to stage-korg-master
...
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
2010-12-02 15:16:53 -08:00
Jean-Baptiste Queru
7a039f9994
Merge "Preserve flags field of event passed to injectKeyEvent()"
2010-12-02 14:56:13 -08:00
Jean-Baptiste Queru
4bdada2c61
Merge from open-source master
...
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
2010-12-02 07:55:06 -08:00
Jean-Baptiste Queru
af8964280b
Merge from open-source master
...
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
2010-12-02 07:54:57 -08:00
Jean-Baptiste Queru
6c48212132
Merge "Fix crash by "adb shell pm list permissions -f|-s""
2010-12-01 09:47:14 -08:00
Jean-Baptiste Queru
459ae1107f
Merge "Fix HTTP redirect missing statuscode 303 and 307"
2010-12-01 08:25:12 -08:00
Trevor Johns
88d3f106bf
am 210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
...
* commit '210e9c4a8b1fdbe9c409f9ce426907587430858a':
Revert "Disabling AccessibilityService sample from build system."
2010-11-24 16:23:47 -08:00
Trevor Johns
ccacf00df2
Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
2010-11-24 16:21:16 -08:00
Xia Wang
eb536090ef
am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
...
* commit 'c1c04ad047d7ca2f13aa5c9883da7219df5bee57':
Add Wi-Fi tests for static IP. DO NOT MERGE
2010-11-24 13:29:56 -08:00
Xia Wang
5cfbd426a4
Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
2010-11-24 13:27:53 -08:00
Scott Main
57087147ef
am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820
...
* commit '93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
docs: clarify <include> layout properties bug: 3227820
2010-11-24 12:43:08 -08:00
Scott Main
03ffe08783
am 3577f51d: docs: clarify <include> layout properties bug: 3227820
...
* commit '3577f51d4bc236a11e283855337752a7b6897f8b':
docs: clarify <include> layout properties bug: 3227820
2010-11-24 12:39:42 -08:00
Jean-Baptiste Queru
ec756056ab
am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"
...
* commit 'f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
frameworks/base: Destroy the overlay even if there is an error
2010-11-23 11:14:57 -08:00
Jean-Baptiste Queru
4e8fa27b4e
Merge "frameworks/base: Destroy the overlay even if there is an error"
2010-11-23 11:02:09 -08:00
Gloria Wang
8cec955963
am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
...
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
Notify the playback status to DRM agents before the playback starts
2010-11-22 21:26:13 -08:00
Gloria Wang
81ee631fd5
am d9334934: Merge "Update of DRM Framework."
...
* commit 'd93349342a89a25c7a884e8543c6adc048c5f86d':
Update of DRM Framework.
2010-11-22 21:25:56 -08:00
Gloria Wang
6772c2d92d
Merge "Notify the playback status to DRM agents before the playback starts"
2010-11-22 21:15:07 -08:00
Gloria Wang
80b7966f1f
Merge "Update of DRM Framework."
2010-11-22 21:14:09 -08:00
Jean-Baptiste Queru
37e7e9e052
resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp
...
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
2010-11-22 16:32:34 -08:00
Jean-Baptiste Queru
dba567c4ae
Merge "Enabling cell broadcast (SMS-CB) support in the platform."
2010-11-22 15:59:04 -08:00
Xia Wang
07db9276c0
am 5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread
...
* commit '5df8c155872833647ac56951ab90bd26a9af9480':
Add Wifi Tethering stress test
2010-11-22 14:46:33 -08:00
Xia Wang
14073fb621
Merge "Add Wifi Tethering stress test" into gingerbread
2010-11-22 14:44:49 -08:00
Naomi Luis
29a73ba845
frameworks/base: Destroy the overlay even if there is an error
...
Allow the overlay object to be destroyed whenever the destroy is
invoked. Currently the destroy call returns if there is an error
encountered, which results in open data and control channels.
Change-Id: I1f2ef4ebb5fb1dcabf05ab50b5bbf6e5e240a63a
2010-11-22 14:03:18 -08:00
Scott Main
30a731e6c5
am 8fac7c2e: change sdk version variable to 2.3 (for docs)
...
* commit '8fac7c2edc433b6c7d153caac238fef595133663':
change sdk version variable to 2.3 (for docs)
2010-11-22 13:55:55 -08:00
Jean-Baptiste Queru
a96d0edeef
am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
...
* commit 'b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
2010-11-22 13:44:56 -08:00
Jean-Baptiste Queru
0fd91dffef
Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
2010-11-22 13:40:29 -08:00
Dirk Dougherty
fa2ef12b08
am 805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
...
* commit '805bddc123c1fc56be333d6ff365f168d4bc2b08':
doc change: Docs for SDK Tools r8, ADT 8
2010-11-19 19:04:56 -08:00
Dirk Dougherty
6063a4c77a
Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
2010-11-19 19:03:03 -08:00
Wu-cheng Li
3dc42067f9
am 589e8381: Merge "Improve camera documentation." into gingerbread
...
* commit '589e838116b0dffa696fa39336d0588124877f98':
Improve camera documentation.
2010-11-19 18:17:24 -08:00
Wu-cheng Li
ced9b3525a
Merge "Improve camera documentation." into gingerbread
2010-11-19 18:14:43 -08:00
Mathias Agopian
7d27daed05
am 927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
...
* commit '927e7410000dd1917387c01fc4229836ddd5eb97':
Fix SensorManager.getOrientation() documentation.
2010-11-19 17:20:14 -08:00
Mathias Agopian
2a4743599b
Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
2010-11-19 17:18:21 -08:00
Scott Main
08f93179ec
am 828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread
...
* commit '828b68166679ebfc0002e2ea516ca91e6fb13597':
docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462
2010-11-19 16:51:57 -08:00
Scott Main
bff5e8c308
Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread
2010-11-19 16:48:50 -08:00
Jean-Baptiste Queru
f863896d52
resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
...
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
2010-11-19 16:21:31 -08:00
Jean-Baptiste Queru
1351c0e488
Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files."
2010-11-19 15:50:29 -08:00
Jean-Baptiste Queru
4d43367eda
am e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
...
* commit 'e3bef7c48d7ec13cb8c7c81dba8d775377e69bed':
Added noop unregisterReceiver to complement existing noop registerReceiver.
2010-11-19 15:43:28 -08:00
Jean-Baptiste Queru
e656aff671
Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
2010-11-19 15:31:30 -08:00
Dirk Dougherty
c512be40bb
am 0e29064d: Merge "Doc change: update media formats table." into gingerbread
...
* commit '0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
Doc change: update media formats table.
2010-11-19 10:53:20 -08:00
Dirk Dougherty
daba254db2
Merge "Doc change: update media formats table." into gingerbread
2010-11-19 10:47:10 -08:00
Brad Fitzpatrick
4175b01d51
am 251384a7: Merge "Improve performance when getting styled string."
...
* commit '251384a7595022ddbc53f4ab0fa386f9c040f1f5':
Improve performance when getting styled string.
2010-11-19 10:25:09 -08:00
Jean-Baptiste Queru
414633971b
am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
...
* commit '14ac9546367d4df37eead55f6762b944b49f33b2':
build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
2010-11-19 10:24:51 -08:00
Brad Fitzpatrick
a62be1a99c
Merge "Improve performance when getting styled string."
2010-11-19 07:41:39 -08:00
Mathias Agopian
da6332fe79
am 671a6ff4: Add support for virtual sensors.
...
* commit '671a6ff4be11b3e2d8eb017e0c7a78e6133fb2b8':
Add support for virtual sensors.
2010-11-18 15:52:14 -08:00
Justin Ho
0ad82aa722
am 80381ab4: Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread
...
* commit '80381ab4ed44bd69c3e3464a848ca15851365b03':
DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem
2010-11-18 15:06:51 -08:00
Justin Ho
d58312b119
Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread
2010-11-18 15:03:39 -08:00
Jeff Brown
46aabb3f51
am b27b8c0c: Fix a key repeating bug. (DO NOT MERGE)
...
* commit 'b27b8c0caf8ff23d10eea655085769f314050427':
Fix a key repeating bug. (DO NOT MERGE)
2010-11-18 12:36:59 -08:00
Jeff Brown
0b7b1960e7
am bfc1cc2d: Fix stuck keys when released out of order. (DO NOT MERGE)
...
* commit 'bfc1cc2d1ea85cc754e63b422eb8cef8ae6a3667':
Fix stuck keys when released out of order. (DO NOT MERGE)
2010-11-18 12:36:50 -08:00
Jeff Brown
9cf416cbcf
Fix a key repeating bug. (DO NOT MERGE)
...
This change fixes a bug in the dispatcher where the window manager
policy would incorrectly receive a key repeat count of 0 in the case
where the key repeat was generated by the hardware or driver.
Long-press on HOME was broken as a result.
Repeating keys could also get stuck down.
Bug: 3159581
Bug: 3208156
Change-Id: I1145487cfcc41a7850dba4cafc63c4a5951ace5b
2010-11-17 19:42:04 -08:00
Jeff Brown
9bb3ef2e78
Fix stuck keys when released out of order. (DO NOT MERGE)
...
Bug: 3208156
Change-Id: I14e4d54f4912de5e2fabcd8638120623aa2d16e0
2010-11-17 19:17:54 -08:00