summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of ee27dd35 to masterJean-Baptiste Queru2010-12-073-22/+37
|\ | | | | | | Change-Id: Ia9f4ea86b8554ff04a3aa6b9e065239ae73740e7
| * am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-masterJean-Baptiste Queru2010-12-073-22/+37
| |\ | | | | | | | | | | | | * commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd': Strings for NI position request are moved to resources
| | * resolved conflicts for merge of 78742e01 to stage-korg-masterJean-Baptiste Queru2010-12-073-22/+37
| | |\ | | | | | | | | | | | | Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
| | | * Merge "Strings for NI position request are moved to resources"Jean-Baptiste Queru2010-12-073-22/+38
| | | |\
| | | | * Strings for NI position request are moved to resourcesHakan Gustavsson2010-12-033-22/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The strings used by the framework for network initiated position requests are now string resources that can be properly localized. Change-Id: If1cba89adb1bfcb9c8fdb59b9c5aa1107b11279e
* | | | | Merge "Fix for Blink in TextView."Gilles Debunne2010-12-071-6/+6
|\ \ \ \ \
| * | | | | Fix for Blink in TextView.Gilles Debunne2010-12-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The callback is removed when the window is detached. Prevents weak references to the TextView from being kept. No longer created for non editable texts (!). Hiding the cursor handle when cursor is hidden. Change-Id: Ic92f6cfc5b6ef6460f1edc6b9a564e4153d9c40f
* | | | | | Fix bug in permission grant system.Costin Manolache2010-12-072-26/+89
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieae1a576fdcba30b24e0430f322843369de2a697
* | | | | | Add WebView.removeJavascriptInterface()Steve Block2010-12-074-2/+42
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 3234178 Change-Id: I7136f8d76b20f90a7e9e1c55b6755ffe6c35b77b
* | | | | Merge "DefaultContainerService's JNI library is required"Kenny Root2010-12-071-1/+1
|\ \ \ \ \
| * | | | | DefaultContainerService's JNI library is requiredKenny Root2010-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change from LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES to make sure the JNI library is built and included when DefaultContainerService is built. Change-Id: I322c72415237c2b70bff345d50e2a9e4f2e6d988
* | | | | | Merge "Fix bug 3259292 - Make FrameLayout respect margins without a gravity ↵Adam Powell2010-12-071-34/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | setting"
| * | | | | | Fix bug 3259292 - Make FrameLayout respect margins without a gravity settingAdam Powell2010-12-071-34/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I94ebf4064e64daaa547263adbdce86bfb836d55d
* | | | | | | Remove broken doc link to removed methodChet Haase2010-12-071-12/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Id1b1ab8e15d9af9fa38946cc5c673062a4b5a72d
* | | | | | Merge "Don't drop video frames but to release them."James Dong2010-12-071-1/+4
|\ \ \ \ \ \
| * | | | | | Don't drop video frames but to release them.James Dong2010-12-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug - 3259009 Change-Id: Ib7634f10a7fe7b7ce7014b79b07957d194bae1a7
* | | | | | | Merge "Prevent scaling beyond zoom overview scale."Shimeng (Simon) Wang2010-12-071-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Prevent scaling beyond zoom overview scale.Shimeng (Simon) Wang2010-12-071-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue: 3243899 Change-Id: I1d6cbb1b1f75c7aadb3b9cc6e82d912217508dc4
* | | | | | | | Merge "Make getSharedPreference() async, blocking on first access."Brad Fitzpatrick2010-12-072-71/+112
|\ \ \ \ \ \ \ \
| * | | | | | | | Make getSharedPreference() async, blocking on first access.Brad Fitzpatrick2010-12-072-71/+112
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3177046 Change-Id: Ibc36a1e196afd39c4f9da513a2bf4ba9e2c72177
* | | | | | | | Merge "Change cancel/end behavior of animations to be synchronous"Chet Haase2010-12-077-168/+117
|\ \ \ \ \ \ \ \
| * | | | | | | | Change cancel/end behavior of animations to be synchronousChet Haase2010-12-077-168/+117
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, cancel() and end() calls would simply log a message to be handled later by the animation handler. This caused problems with coordinating complex animations, where some start() events for future animations would occur before end() events for animations already completed. The change is to make these events synchronous (and require them to be called from the appropriate thread), simplifying the code and the usage. Also, fixed various timing and event bugs in AnimatorSet, and removed the getter/setter properties from ObjectAnimator, since an earlier change makes these properties undesirable (because the code will use a faster JNI approach instead of reflection when it can). Change-Id: I05c16645c2a31a92048a6031ddb126eb4312a946
* | | | | | | | Merge "Have MobileDataStateTracker & DataConnectionTracker communicate ↵Wink Saville2010-12-078-79/+169
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | directly."
| * | | | | | | Have MobileDataStateTracker & DataConnectionTracker communicate directly.Wink Saville2010-12-078-79/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added CMD_SET_DATA_ENABLE which is sent when data is enabled/disabled via the ConnectivityService. It is anticipated that the communication channel will be used for additional commands and to receive unsoliciated commands from DataConnectionTracker back to MobileDataStateTracker. Change-Id: I3863e7385155d503f069b1dcb7e4f766ec78b5f8
* | | | | | | | Merge "Add fling to scrollable layers."Patrick Scott2010-12-071-45/+114
|\ \ \ \ \ \ \ \
| * | | | | | | | Add fling to scrollable layers.Patrick Scott2010-12-071-45/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requires a change in external/webkit. Use the normal drag/fling pipeline but handle layers in each of the callbacks. Record the scrolling range for a layer and use it to compute the fling/drag ranges. If the user reaches the edge of a layer, switch to scrolling the main page unless the user switches direction. Change-Id: Ifedde8fcf4f76d533586164c75defcebffec16e9
* | | | | | | | | Merge "API Support for both synchronous and queued commands, optionally ↵Andreas Huber2010-12-078-65/+256
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | associated metadata."
| * | | | | | | | API Support for both synchronous and queued commands, optionally associated ↵Andreas Huber2010-12-068-65/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | metadata. Change-Id: Idb90d64cb638942210c5822b3cba2f05b087d601
* | | | | | | | | Merge "Integrating updated Google Talk stat_notify icon (mdpi)"Justin Ho2010-12-071-0/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Integrating updated Google Talk stat_notify icon (mdpi)Justin Ho2010-12-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I530aa3a0e771fb110705b11b2d7169915268db21
* | | | | | | | | am 8c30a47d: am 47e6ccb6: Merge "Corrected MIFARE default key set" into ↵Nick Pelly2010-12-071-6/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '8c30a47d801be50272098e60d0079ae1b4ebd22a': Corrected MIFARE default key set
| * | | | | | | am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbreadNick Pelly2010-12-071-6/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47e6ccb65ab0088cf04809c234cdb5f747579c8c': Corrected MIFARE default key set
| | * \ \ \ \ \ \ Merge "Corrected MIFARE default key set" into gingerbreadNick Pelly2010-12-071-6/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Corrected MIFARE default key setJan Brands2010-12-071-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The all-zero key is not a commonly used key. Fixed naming Change-Id: I2fb86079159195c6893ea758e8b0bbda266dc420
* | | | | | | | | | Merge "Prevent SearchView dropdown from showing up when SearchView is hidden."Amith Yamasani2010-12-071-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Prevent SearchView dropdown from showing up when SearchView is hidden.Amith Yamasani2010-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3257833
* | | | | | | | | | | check for native instance before callingCary Clark2010-12-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:3258992 Change-Id: Ia9bf7bdbbe2b5566121113174d032d316664f3b1
* | | | | | | | | | | Delay message for <select> choice.Leon Scroggins2010-12-071-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:3230016 Pass the message after the page is set to active, which calls a focus event, which may modify the page. Change-Id: I594ba30a7a105595b27bc0356c164c41e48dcd15
* | | | | | | | | | | Add a Dummy data connection for testing purposes.Robert Greenwalt2010-12-073-1/+229
| |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable with: <string-array translatable="false" name="networkAttributes"> <item>"wifi,1,1,1"</item> <item>"dummy,7,7,0"</item> </string-array> in your config.xml Change-Id: I3965edaeb4873e95131f4083b8d23d682ce17841
* | | | | | | | | | am c9cc9ab5: am 5f86d7f5: Merge "Fix SIP bug of different transport/port ↵Chung-yih Wang2010-12-063-15/+44
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used for requests." into gingerbread * commit 'c9cc9ab590ef879877e466c0b5f5823e11bb4c47': Fix SIP bug of different transport/port used for requests.
| * | | | | | | | | am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for ↵Chung-yih Wang2010-12-063-15/+44
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requests." into gingerbread * commit '5f86d7f50beba9f6327b8a04defe4e989a153d4a': Fix SIP bug of different transport/port used for requests.
| | * | | | | | | | Merge "Fix SIP bug of different transport/port used for requests." into ↵Chung-yih Wang2010-12-063-15/+44
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | | | Fix SIP bug of different transport/port used for requests.Chung-yih Wang2010-12-073-15/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: http://b/3156148 Change-Id: I4fa5b274d2e90ebde12d9e99822dc193a65bad32
* | | | | | | | | | | am 0d49a4e8: am 0871ee0c: Doc change: fix href to axis_globe_inverted ↵Dirk Dougherty2010-12-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orientation diagram. * commit '0d49a4e838769252a313738e30fe78557f769a59': Doc change: fix href to axis_globe_inverted orientation diagram.
| * | | | | | | | | | am 0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram.Dirk Dougherty2010-12-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0871ee0c6f43a7201ce49a66211c1c850eabeb6b': Doc change: fix href to axis_globe_inverted orientation diagram.
| | * | | | | | | | | Doc change: fix href to axis_globe_inverted orientation diagram.Dirk Dougherty2010-12-061-1/+1
| | | |_|/ / / / / / | | |/| | | | | | |
* | | | | | | | | | am 7012f1eb: am 9a9706a2: Added missing ndef technology to getTech.Martijn Coenen2010-12-061-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7012f1eb3759a071f06cff69cf449adb4c62192b': Added missing ndef technology to getTech.
| * | | | | | | | | am 9a9706a2: Added missing ndef technology to getTech.Martijn Coenen2010-12-061-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a9706a213637b396226afff53c69927283609a7': Added missing ndef technology to getTech.
| | * | | | | | | | Added missing ndef technology to getTech.Martijn Coenen2010-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f08e140c9bb43a8e894812adbc4d11801637f46
* | | | | | | | | | am 68cea273: am e58e8a71: Merge "Added NdefFormatable tag, initial class ↵Nick Pelly2010-12-062-0/+67
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with supported methods." into gingerbread * commit '68cea273299e59e28f9ccd87c520cc57cbf5adce': Added NdefFormatable tag, initial class with supported methods.