Chet Haase
5c13d89c13
Optimizing display lists by referencing pointers to resources instead of copying them
...
Change-Id: I81ad3551d74aa1e5bb64d69e33d2eb29a6c1eb6a
2010-10-21 12:02:42 -07:00
Scott Main
4b5da6829a
docs: fix a couple api links
...
Change-Id: If0e35011a28dc87324e2d53e856cfcdb35236061
2010-10-21 11:49:12 -07:00
Gilles Debunne
83322fd4db
Merge "Fix to display first tab as selected on tab widget creation."
2010-10-21 11:19:10 -07:00
Dianne Hackborn
b37cc33030
am b5018723: am 74b1ed32: Fix issue #3113219 : NativeActivity using wrong lib path with Java code
...
Merge commit 'b50187237c1bdbb805b67bbc35002b243b8a86fe'
* commit 'b50187237c1bdbb805b67bbc35002b243b8a86fe':
Fix issue #3113219 : NativeActivity using wrong lib path with Java code
2010-10-21 10:55:52 -07:00
Dirk Dougherty
4ef36afa32
am 18cbc0e5: am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
...
Merge commit '18cbc0e58a0e68411dff655f116a7010c3f464a2'
* commit '18cbc0e58a0e68411dff655f116a7010c3f464a2':
Doc change: escape angle brackets in javadoc comment.
2010-10-21 10:55:21 -07:00
Steve Block
1c9ca4f1fa
Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack
...
Requires a change to external/webkit ...
https://android-git.corp.google.com/g/75473
Bug: 3086308
Change-Id: I01274b3b1384a6947d5a56a51b0b93b1898ddebc
2010-10-21 17:53:20 +01:00
Sylvain Fonteneau
4fc9ecf223
am a71354d7: Enable presence check at application level using RawTagConnection.isConnected() method.
...
Merge commit 'a71354d76689802152c33af257092d639c03c421' into gingerbread-plus-aosp
* commit 'a71354d76689802152c33af257092d639c03c421':
Enable presence check at application level using
2010-10-21 09:38:49 -07:00
Nick Pelly
c0e93a849f
am 7ea5c45e: NFC settings cleanup.
...
Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp
* commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1':
NFC settings cleanup.
2010-10-21 09:38:15 -07:00
Brad Fitzpatrick
385a753dea
resolved conflicts for merge of 368fdba4 to master
...
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
2010-10-21 07:39:10 -07:00
Sylvain Fonteneau
a71354d766
Enable presence check at application level using
...
RawTagConnection.isConnected() method.
Also needs packages/apps/Nfc to be updated.
Change-Id: I726e88853e2c4b348f3b87b7574bc6eded7f5b7c
Signed-off-by: Nick Pelly <npelly@google.com >
2010-10-21 03:54:52 -07:00
Nick Pelly
7ea5c45e8d
NFC settings cleanup.
...
Remove NFC settings from Settings.System. The NFC Service tracks them
internally using SharedPreference.
Revert back to enable()/disable()/isEnabled() - Tag discovery is the
only functionality NFC service performs right now so we don't need to
break it up more explicitly yet. enable/disable is the global NFC
on/off and later we'll add enableDiscovery(), enableTagEmulation(),
enableSecureElement() etc as needed.
Change-Id: Id5b23e89d4a29511835f509962842452075e56cb
Signed-off-by: Nick Pelly <npelly@google.com >
2010-10-21 03:54:51 -07:00
Chris Tate
a376d030a2
Merge "Fix obtain() when the pool is still empty"
2010-10-20 19:04:34 -07:00
Chris Tate
c02c7af0ec
Fix obtain() when the pool is still empty
...
Fixes bug 3116798
Change-Id: I187e79892cd2b60173ef4ebef5d2eab56eb5eb42
2010-10-20 19:01:55 -07:00
Gilles Debunne
97dfd3492f
Fix to display first tab as selected on tab widget creation.
...
Change-Id: Icc6ec78d2392a300b43b522b3dc18d0ab1223116
2010-10-20 18:26:57 -07:00
Jean-Baptiste Queru
843ff92bb0
resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp
...
Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d
2010-10-20 18:16:57 -07:00
Dianne Hackborn
674b856c15
am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
...
Merge commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de' into gingerbread-plus-aosp
* commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de':
Fix java doc on FLAG_EXTERNAL.
2010-10-20 17:14:59 -07:00
Dianne Hackborn
fb2cd0aa9d
Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
2010-10-20 17:12:27 -07:00
Jean-Baptiste Queru
5d919b4387
Merge "Make disabled TextViews uneditable"
2010-10-20 16:46:52 -07:00
Jean-Baptiste Queru
eceace47c5
am 81925e66: Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center"
...
Merge commit '81925e665c1e25d04cbc10e7333e793416bdc98f' into gingerbread-plus-aosp
* commit '81925e665c1e25d04cbc10e7333e793416bdc98f':
Fix FastScroller overlay position bug
2010-10-20 16:33:51 -07:00
Dianne Hackborn
eddfc04a08
Fix java doc on FLAG_EXTERNAL.
...
Change-Id: Ic533b3a6c3300a986dd8d0da04243d723cf393ef
2010-10-20 16:03:37 -07:00
Wink Saville
1b35f942ec
Merge "Add AsyncChannel and AsyncService."
2010-10-20 15:51:23 -07:00
Wink Saville
d20a5d6b5a
Add AsyncChannel and AsyncService.
...
Change-Id: Ie6f9aed58f49defcd1c051611ce791e2e62a9474
2010-10-20 15:17:28 -07:00
Dianne Hackborn
153bf6c8d7
am e9e23405: Merge "Fix issue #3113424 : Battery stats don\'t reset on Crespo" into gingerbread
...
Merge commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d' into gingerbread-plus-aosp
* commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d':
Fix issue #3113424 : Battery stats don't reset on Crespo
2010-10-20 14:10:29 -07:00
Dianne Hackborn
b50187237c
am 74b1ed32: Fix issue #3113219 : NativeActivity using wrong lib path with Java code
...
Merge commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004' into gingerbread-plus-aosp
* commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004':
Fix issue #3113219 : NativeActivity using wrong lib path with Java code
2010-10-20 13:56:03 -07:00
Dirk Dougherty
18cbc0e58a
am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
...
Merge commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp
* commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de':
Doc change: escape angle brackets in javadoc comment.
2010-10-20 13:54:09 -07:00
Vasu Nori
c63c320c09
Merge "remove duplicate code"
2010-10-20 13:46:19 -07:00
Vasu Nori
ef7e33b9b8
remove duplicate code
...
Change-Id: I60faf921de4b9add619e2450e0a19a111ede7984
2010-10-20 13:37:33 -07:00
Amith Yamasani
b1818e83f4
Update dropdown colors and list readability for SearchView.
...
Dismiss IME on launching suggestion.
2010-10-20 13:32:24 -07:00
Dianne Hackborn
266e607bde
Fix issue #3113424 : Battery stats don't reset on Crespo
...
Change-Id: I38cc3cdfa9cb1466fe3659f001ee57aecf9df179
2010-10-20 12:26:48 -07:00
Irfan Sheriff
4f5f7c9683
Fix wake and scan behavior
...
- Add wakelock for driver start/stop to ensure a wifilock
acquisition kick starts driver. Also cleaned up state machine
driver start/stop behavior.
- Add periodic scans when driver is started to ensure wifi
reconnections when wifilock exists or when user chooses
never to sleep
- some minor clean up
Change-Id: I844eb70491d5aa2f8c8933b3d8dd01ba237ee534
2010-10-20 12:04:21 -07:00
Ben Murdoch
be00398005
Merge "Set the unique id of the AutoFill profile WebKit can read it"
2010-10-20 11:35:47 -07:00
Ben Murdoch
b1b82a8df8
Set the unique id of the AutoFill profile WebKit can read it
...
After the recent Chromium merge to 7.0.540.0, it seems that we are no
longer allowed to use a profile unique id of 0. Set the unique id
in the AutoFillProfile class so that WebKit can access it.
Change-Id: I88cd1e91b8c6043c732a1709a89fda4a3c9f921f
2010-10-20 18:56:23 +01:00
Dianne Hackborn
74b1ed3231
Fix issue #3113219 : NativeActivity using wrong lib path with Java code
...
Use the same path whether the .apk has dalvik code or not.
Change-Id: I66397d7f7e328d5580565ceb17a941afac0e0f8b
2010-10-20 10:22:45 -07:00
Dirk Dougherty
3466e1fc6d
Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
2010-10-20 09:34:24 -07:00
Ben Murdoch
9532677ad8
Merge "Implement file downloads for Chrome HTTP stack (Java side)"
2010-10-20 08:36:17 -07:00
Iain Merrick
d77f9b7b39
Implement file downloads for Chrome HTTP stack (Java side)
...
This just adds an extra entrypoint to BrowserFrame. It delegates
directly to the identical method in CallbackProxy, and from there
downloads are handled in the same way as before.
See matching C++ change in external/webkit (I81300400)
Change-Id: I87e71debe475d0d24e13a5763fbe803e3cd78cf5
2010-10-20 15:55:12 +01:00
Wu-cheng Li
b982fb4fd3
Mirror the preview for front-facing cameras. do not merge
...
Now overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V
or FLIP_H first. The formula should be changed after overlay is fixed.
bug:3059865
Change-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6
2010-10-20 18:29:18 +08:00
Jack Wang
b1d042dc31
Merge "Added RepetitiveTest annotation and test runner support"
2010-10-20 03:23:49 -07:00
Adam Powell
548f76f135
Fix bug 3113015 - ProgressDialogs using wrong theme.
...
Change-Id: I161e7feeb2e1a712dff4372417c20913c1dba661
2010-10-19 19:01:55 -07:00
Jack Wang
3fc03e619f
Added RepetitiveTest annotation and test runner support
...
Change-Id: I7bf0871ede6dd69512c6b6ea3484693ba5b78e89
2010-10-19 18:23:18 -07:00
Mindy Pereira
62ad0db623
am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
...
Merge commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp
* commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
2010-10-19 18:23:18 -07:00
Patrick Dubroy
382f7a140e
Merge "Fix memory leak with TouchTargets not being recycled."
2010-10-19 18:03:46 -07:00
Adam Powell
34625c6b41
Merge "Add ActionBar tab callback method onTabReselected"
2010-10-19 17:58:20 -07:00
Mindy Pereira
6fbc5d9c19
DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
...
Fixes b/3111778 overscroll glitch in news & weather
Change-Id: Ic255da1f7c4301ea3980acc4fa033c9f17a60dac
2010-10-19 17:38:24 -07:00
Patrick Dubroy
fb0547d2c0
Fix memory leak with TouchTargets not being recycled.
2010-10-19 17:36:18 -07:00
Adam Powell
7f9b90542e
Add ActionBar tab callback method onTabReselected
...
onTabReselected is called if an already-selected tab is chosen again.
For many apps this will be a no-op, but some may treat it as a signal
to return to the top level of a given navigation category.
Change-Id: Ic51fbe477b979562f2d848c4070b2016b217a90f
2010-10-19 17:18:20 -07:00
Dmitri Plotnikov
99291b95b2
Merge "Adding Insert.DATA extra for new/edit contact intents."
2010-10-19 15:49:25 -07:00
Chris Tate
a949d7d881
Merge "Introduce an OnDragListener mechanism"
2010-10-19 13:58:07 -07:00
Chris Tate
32affef4f8
Introduce an OnDragListener mechanism
...
If the listener's onDrag(view, event) returns 'false', the view's own
onDragEvent() will be called. If the listener returns 'true', it
consumes the event (and declares that it will handle the rest of the
drag event sequence, in the case of DRAG_STARTED actions).
Change-Id: I01aff0e4f59f71e55f5eea1049905c80714f0607
2010-10-19 13:56:17 -07:00
Brad Fitzpatrick
6be063d8a9
am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
...
Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1'
* commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1':
Fix Vibrator permission CTS test broken earlier.
2010-10-19 13:38:00 -07:00