Gilles Debunne
732c590ad6
Merge "Tapping in a empty textEdit shows the handle."
2010-11-03 12:21:16 -07:00
Gilles Debunne
3c5e94335a
Tapping in a empty textEdit shows the handle.
...
So that the user can paste in that field, by tapping on the handle.
Change-Id: Ib43291fb78ded7c9b41c52cf3030fe0144d085c3
2010-11-03 12:19:39 -07:00
Ben Komalo
53eb6af2ac
Merge "Fix issue where home layout click listener was being attached before it was initialized."
2010-11-03 12:18:40 -07:00
Adam Powell
01f706260b
Merge "Make Theme.Holo.Dialog.Alert and Theme.Holo.Light.Dialog.Alert public"
2010-11-03 12:06:44 -07:00
Ben Komalo
ad199ecc44
Fix issue where home layout click listener was being attached
...
before it was initialized.
Change-Id: I25641ca7c2db18d423dcafebc9bdf42d608a7a31
2010-11-03 12:05:49 -07:00
James Dong
e0c0504c7e
am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbread
...
* commit 'a3f5b615d7adc5a644cbedd55100deba562ec0ac':
DO NOT MERGE
2010-11-03 12:02:53 -07:00
Adam Powell
13fd8de5cd
Make Theme.Holo.Dialog.Alert and Theme.Holo.Light.Dialog.Alert public
...
Change-Id: I72aa81fee745aee67269e6b24eab0f61ed693baf
2010-11-03 12:02:13 -07:00
Chris Tate
5f4b7d8a8a
Merge "Fix drag enter/exit reporting"
2010-11-03 12:00:56 -07:00
Dianne Hackborn
a2773f51fd
am 0ce0f72c: am 906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations."
...
* commit '0ce0f72c1eb92cf654667c15477f19b4a7e84cd1':
Revert "UMS: Avoid SystemUI ANRs during long vold operations."
2010-11-03 11:43:16 -07:00
Daniel Sandler
dfd7e58d62
am 1df8765a: am cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
...
* commit '1df8765ac05ed83c212e899fa6c74a6cc012e7b0':
UMS: Avoid SystemUI ANRs during long vold operations.
2010-11-03 11:43:03 -07:00
Jason parks
f13b445294
am bcbf17a5: am 73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
...
* commit 'bcbf17a5823380b59ad5617c79c1f14d365bdc23':
Return a zero length byte from toByteArray instead of null.
2010-11-03 11:42:40 -07:00
Dirk Dougherty
d8c2efdcd3
am 243a28ba: am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
...
* commit '243a28ba2d58acea96a33cd6c73cb805a653863f':
Doc change: Update uses-feature and permissions docs.
2010-11-03 11:42:31 -07:00
Brad Fitzpatrick
41727a4592
am f3a6b901: am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"
...
* commit 'f3a6b901917b1609c6f1901bb36deb07a58fd20d':
NotificationManager: droiddoc documentation improvements
2010-11-03 11:42:19 -07:00
Gloria Wang
e3afc288dd
resolved conflicts for merge of a8d7b747 to master
...
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
2010-11-03 11:39:04 -07:00
Nick Pelly
cc82f3ae3c
am 6fb9316f: am 38e561dd: Merge "Remove timeout support." into gingerbread
...
* commit '6fb9316f6bd72b406bbfc61bd210281744eea9c1':
Remove timeout support.
2010-11-03 10:59:54 -07:00
Jean-Baptiste Queru
b079e7d408
am c91e4673: am bbd212d7: Merge "Document per-implementation behaviors of native get* methods"
...
* commit 'c91e46730d14611fb85cd7b2d3e51dac5ce538a2':
Document per-implementation behaviors of native get* methods
2010-11-03 10:59:44 -07:00
Jean-Baptiste Queru
ae60b8a132
am 0b5d57ab: am 715f8610: Merge "Clarify documentation of Cursor get* methods."
...
* commit '0b5d57ab7ea062af4502be5af2d51883d251c0bc':
Clarify documentation of Cursor get* methods.
2010-11-03 10:59:36 -07:00
Gloria Wang
8f7a0275f2
am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp
...
* commit 'cf393faaa871333496a63c13196fdbc0f2bd9118':
- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.
2010-11-03 10:59:23 -07:00
Joe Malin
a7bd885738
am fcea62a6: am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread
...
* commit 'fcea62a64cba3422ae7d0c1eeee529fd49485984':
DOC CHANGE: Add entry for monkeyrunner to tools index page.
2010-11-03 10:59:03 -07:00
Raphael
54e460f49f
am 19ed73ae: am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread
...
* commit '19ed73ae7fddf66b335a89a33d346a5b50c1f274':
Support for <compatible-screens><screen> in ADT.
2010-11-03 10:58:47 -07:00
Gilles Debunne
1547423cc9
am a090d64a: (-s ours) am 18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbread
...
* commit 'a090d64ac198b878a3ea01204298d5ed5eb8fbb8':
Rescaled/updated mdpi assets added.
2010-11-03 10:58:09 -07:00
Gilles Debunne
f9d7073a0e
am 51b9cc04: (-s ours) am 94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbread
...
* commit '51b9cc04e816a2bd613ad624b3ed7c6f12381928':
Rescaled/updated mdpi assets added.
2010-11-03 10:50:29 -07:00
James Dong
a3f5b615d7
am f3847e87: Merge "DO NOT MERGE" into gingerbread
...
* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
DO NOT MERGE
2010-11-03 09:25:08 -07:00
James Dong
f3847e875e
Merge "DO NOT MERGE" into gingerbread
2010-11-03 09:21:44 -07:00
Dianne Hackborn
0ce0f72c1e
am 906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations."
...
* commit '906b830d1d61cbd8b1f9c2dc87e564cfb0f315fd':
Revert "UMS: Avoid SystemUI ANRs during long vold operations."
2010-11-02 22:28:10 -07:00
Dianne Hackborn
906b830d1d
Revert "UMS: Avoid SystemUI ANRs during long vold operations."
...
This reverts commit 010704f95de534214cd7b86f93e22050a595dce3.
2010-11-02 22:23:53 -07:00
Daniel Sandler
1df8765ac0
am cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
...
* commit 'cbc3219d2864a0b8d8ee6cda2c0b9a679bdeb200':
UMS: Avoid SystemUI ANRs during long vold operations.
2010-11-02 20:35:17 -07:00
Daniel Sandler
cbc3219d28
Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
2010-11-02 20:34:10 -07:00
Gil Dobjanschi
82415bed34
Merge "Use SoftReference for WaveformData"
2010-11-02 20:26:22 -07:00
James Dong
6786fccf5a
DO NOT MERGE
...
Fix premature release of recording frames when physical address or metadata is stored in input video buffers
- bug 3158459
Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
2010-11-02 19:30:01 -07:00
Gil Dobjanschi
db963e9c64
Use SoftReference for WaveformData
...
Change-Id: I801a4eb4f55e0c6244f868bf8b474a2a79d81642
2010-11-02 19:19:04 -07:00
Jason parks
bcbf17a582
am 73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
...
* commit '73eba2a6bcf39eb20d815517ed11e1a7fb7a2c39':
Return a zero length byte from toByteArray instead of null.
2010-11-02 19:00:12 -07:00
Jason parks
73eba2a6bc
Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
2010-11-02 18:58:09 -07:00
Daniel Sandler
010704f95d
UMS: Avoid SystemUI ANRs during long vold operations.
...
Stop handling StorageEventListener callbacks on the main
thread, where calls back into StorageManager could take a
while (i.e., during a long fsck).
Bug: 3138068
Change-Id: Icf2a836b69ff60606edce7c5575ad64dc24698c6
2010-11-02 21:47:22 -04:00
Xavier Ducrohet
f0ef383599
Merge "More implementation of the layoutlib Paint/Canvas delegates."
2010-11-02 18:28:16 -07:00
Jeff Brown
d40a73e7fc
Merge "Fix a key repeating bug."
2010-11-02 18:23:55 -07:00
Adam Powell
81b8944131
Fix bug 3093591 - add richer control over default tab selection in ActionBar
...
Added overloads to ActionBar#addTab with control over whether the added tab
will become selected or not. Old versions implemented in terms of the new.
Change-Id: I810c64652bb7e755b81151ce8a2c765266d78a66
2010-11-02 18:18:37 -07:00
Jason parks
3ebd59bb5d
Return a zero length byte from toByteArray instead of null.
...
Change-Id: I67b388099c72a0d2ec6b429caea8f29bf8f7a75a
2010-11-02 20:03:52 -05:00
Jeff Brown
e46a0a4693
Fix a key repeating bug.
...
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.
Bug: 3159581
Change-Id: If0f02662313f5b879a4e566fbb461389e274a550
2010-11-02 17:58:22 -07:00
Dirk Dougherty
243a28ba2d
am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
...
* commit '4e4d0d5f207421b0a2ce134fe17d7c78defc9dac':
Doc change: Update uses-feature and permissions docs.
2010-11-02 17:47:20 -07:00
Dirk Dougherty
4e4d0d5f20
am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
...
* commit '36a1bcee76d35636b4050674eb98285c3a3a6c2f':
Doc change: Update uses-feature and permissions docs.
2010-11-02 17:43:54 -07:00
Dirk Dougherty
36a1bcee76
Merge "Doc change: Update uses-feature and permissions docs." into froyo
2010-11-02 17:40:27 -07:00
Jeff Brown
5ffcd088ce
Merge "Add plumbing for volume mute key."
2010-11-02 17:38:18 -07:00
Dirk Dougherty
f1e134ba6a
Doc change: Update uses-feature and permissions docs.
...
Change-Id: I80b45840d83e0622a7b5efeed00a3c659d80ca9b
2010-11-02 17:37:23 -07:00
Jeff Brown
b0418da0e7
Add plumbing for volume mute key.
...
Full support for the volume mute key will be implemented in a
later change.
Bug: 2912307
Change-Id: I98c27d6360f159c8b7447e04b45f442eff87b38a
2010-11-02 17:31:39 -07:00
Gloria Wang
d4bb9b3789
Merge "Use SystemProperties.get() instead of System.getProperty()"
2010-11-02 17:26:24 -07:00
Gloria Wang
1f89c4f9f8
Use SystemProperties.get() instead of System.getProperty()
...
Change-Id: I92571fa217e6623345bbd84cf87ab939fbe63b0a
2010-11-02 16:56:42 -07:00
Gilles Debunne
cbaff3c1c6
Fix text color in paste popup.
...
Change-Id: Ic4ca2ec0bb19016b7a633684c60f2c00923784cc
2010-11-02 16:50:19 -07:00
Romain Guy
98444a944c
Merge "Optimize FBO drawing with regions. This optimization is currently disabled until Launcher is modified to take advantage of it. The optimization can be enabled by turning on RENDER_LAYERS_AS_REGIONS in the OpenGLRenderer.h file."
2010-11-02 16:23:22 -07:00
Romain Guy
5b3b35296e
Optimize FBO drawing with regions.
...
This optimization is currently disabled until Launcher is
modified to take advantage of it. The optimization can be
enabled by turning on RENDER_LAYERS_AS_REGIONS in the
OpenGLRenderer.h file.
Change-Id: I2fdf59d0f4dc690a3d7f712173ab8db3848b27b1
2010-11-02 16:17:23 -07:00