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
Jean-Baptiste Queru
487ddf384f
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*"
2010-11-17 18:40:31 -08:00
Scott Main
6b2da0ae76
am 0fe33a48: am 2cbe92ea: docs: add better visibility to app install location doc
...
* commit '0fe33a4835ae3721f6302f3f2112d79e43b2b4f6':
docs: add better visibility to app install location doc
2010-11-17 18:37:50 -08:00
Scott Main
bc2e494938
am 2cbe92ea: docs: add better visibility to app install location doc
...
* commit '2cbe92ea6d36adb721b0cb94f5dbecb9c9e71ad8':
docs: add better visibility to app install location doc
2010-11-17 18:34:40 -08:00
Jean-Baptiste Queru
774a82b116
am 27c06bab: Merge "Release reference when putting RILRequest back into the pool."
...
* commit '27c06bab513a1893444d50bb5dedbad5c0100029':
Release reference when putting RILRequest back into the pool.
2010-11-17 18:09:08 -08:00
Jean-Baptiste Queru
db584845a2
Merge "Release reference when putting RILRequest back into the pool."
2010-11-17 17:58:14 -08:00
Jean-Baptiste Queru
46ff36a83c
am d34c1495: Merge "Prevent system crash when OOM in Binder thread."
...
* commit 'd34c1495020e5d72dd18959fb906375dc0874c04':
Prevent system crash when OOM in Binder thread.
2010-11-17 17:56:05 -08:00
Jean-Baptiste Queru
c6655ffd8a
am 11dba787: Merge "Fix build (broken documentation link)"
...
* commit '11dba787e10ff5ddc27e834db42acefa33cd35be':
Fix build (broken documentation link)
2010-11-17 17:56:00 -08:00
Jean-Baptiste Queru
15fcb29657
Merge "Prevent system crash when OOM in Binder thread."
2010-11-17 17:49:19 -08:00
Jean-Baptiste Queru
5f17185a76
Merge "Fix build (broken documentation link)"
2010-11-17 17:41:22 -08:00
Jean-Baptiste Queru
af10976583
am a15e4886: Merge "Framebuffer: Support variable number of framebuffers in the UI"
...
* commit 'a15e4886de8f75f3cb137f51743d330414c910e8':
Framebuffer: Support variable number of framebuffers in the UI
2010-11-17 17:29:48 -08:00
Jean-Baptiste Queru
d5b427b709
am 09e50cdb: Merge "Reorder lock acquision vs try."
...
* commit '09e50cdbc62938b178f4c9a66b3cec8a466daaa8':
Reorder lock acquision vs try.
2010-11-17 17:16:06 -08:00
Jean-Baptiste Queru
90ea001a09
Merge "Framebuffer: Support variable number of framebuffers in the UI"
2010-11-17 17:15:42 -08:00
Jean-Baptiste Queru
a7011da1f7
Merge "Reorder lock acquision vs try."
2010-11-17 17:03:10 -08:00
Jean-Baptiste Queru
a7dda98df7
Merge "resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp" into gingerbread-plus-aosp
2010-11-17 16:52:56 -08:00
Jean-Baptiste Queru
8ff8a2d029
resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp
...
Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8
2010-11-17 16:47:59 -08:00
Dirk Dougherty
a25a6835e7
am fc1f5e24: doc change: update uses-feature for gingerbread.
...
* commit 'fc1f5e24bcd678a08221c8c01a364807edca6daf':
doc change: update uses-feature for gingerbread.
2010-11-17 16:20:59 -08:00
Jean-Baptiste Queru
3bffa0529c
Merge "Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter."
2010-11-17 15:10:05 -08:00
Dianne Hackborn
ae1f9dce70
am 05434e9f: Final API 9. Really! Honestly! I hope.
...
* commit '05434e9fa7a6ec844611bbd154c4a3eceafec538':
Final API 9. Really! Honestly! I hope.
2010-11-16 17:49:07 -08:00
Brad Fitzpatrick
ce3408965f
am 383e95e2: Merge "DropBox: Read until the end of stream has been reached"
...
* commit '383e95e245ceb87a2a6ad6422404ce641f0e08eb':
DropBox: Read until the end of stream has been reached
2010-11-16 09:37:56 -08:00
Brad Fitzpatrick
4a8dad92bb
Merge "DropBox: Read until the end of stream has been reached"
2010-11-16 09:22:31 -08:00
Xia Wang
4f5ba34a57
am d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread
...
* commit 'd0a8f54a5bcd6a10eaaa88d888c3cbb83869532c':
Add Wi-Fi connection functional tests.
2010-11-16 09:16:54 -08:00
Xia Wang
7da37c0bdd
Merge "Add Wi-Fi connection functional tests." into gingerbread
2010-11-16 09:14:46 -08:00
Mathias Agopian
83da32bb74
am 305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
...
* commit '305bc0fe977f6197bfae847dbaf58916cf8980ba':
Fix a race condition in sensormanager
2010-11-15 13:19:46 -08:00
Mathias Agopian
fc2aa31e63
am 9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
...
* commit '9e291a4b9922719165145434217e100e2118860d':
Revert "allow all 4 orientations"
2010-11-15 13:19:43 -08:00
Mathias Agopian
038d998774
Merge "Fix a race condition in sensormanager" into gingerbread
2010-11-15 13:14:59 -08:00