Shimeng (Simon) Wang
d15949e65d
Merge "Pass whether a scroll is user-scrolled or not to webkit."
2010-10-22 10:30:57 -07:00
Shimeng (Simon) Wang
50b1034d35
Pass whether a scroll is user-scrolled or not to webkit.
...
This is to eliminate false scrollEvent to webkit. And the side effect
is that the history scroll position will be correctly restored;
otherwise, webkit think there's user scrolled and not send back history
scroll position.
Particulary for NEW_PICTURE_MSG from webkit, the scroll event because of
it are not user-scrolled.
issue: 3063945
Change-Id: I9fdbfcb8baf07baf2331e2c4eed66f88aea744ef
2010-10-22 10:29:19 -07:00
Nick Pelly
d29c990874
am c81ec79d: am 0592832c: Merge "Attempt to fix simulator build." into gingerbread
...
Merge commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e'
* commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e':
Attempt to fix simulator build.
2010-10-22 09:17:41 -07:00
Chet Haase
0865f7629a
Merge "Fix native resource leak when OpenGL renderer is not being used."
2010-10-22 09:07:13 -07:00
Nick Pelly
c81ec79d1f
am 0592832c: Merge "Attempt to fix simulator build." into gingerbread
...
Merge commit '0592832c5e61b9c0008a4410f263ea0b0b991f05' into gingerbread-plus-aosp
* commit '0592832c5e61b9c0008a4410f263ea0b0b991f05':
Attempt to fix simulator build.
2010-10-22 09:03:21 -07:00
Chet Haase
27f0b17d85
Fix native resource leak when OpenGL renderer is not being used.
...
Native resources (bitmaps, matrices, paints, shaders) are shared when display lists
are used, and a refcounting system is in place to take care of disposing when all
clients are finished with them. But the cache where these refcounts are tracked is
not enabled when the Open GL renderer is not being used. This results in the native
destructors not being called, and the resources are leaked.
Change-Id: Ic7aeb55e4636dcad229846601407e596160346e6
2010-10-22 08:57:48 -07:00
Nick Pelly
1af97f0b78
Attempt to fix simulator build.
...
Change-Id: I7f912ce58292bdd03fa683d2e5c203480d94e945
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-22 08:48:48 -07:00
Leon Scroggins
f8ca2d71d5
Do not call WebTextView.requestFocus if WebView is not focused.
...
Bug:3118097
Bug:3039912
Change-Id: I4c43f394c9dc3c9db58fb744d588dfb36f3221f4
2010-10-22 10:47:36 -04:00
Steve Block
3b860faec7
Merge "Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack"
2010-10-22 03:56:58 -07:00
Jeff Hamilton
de8635e4c4
am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.
...
Merge commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a' into gingerbread-plus-aosp
* commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a':
Backport ParcelFileDescriptor.createPipe() from master.
2010-10-21 21:08:20 -07:00
Daniel Lehmann
cde1ac6006
Add an extra to allow specifying the account for creation of new contacts
...
Change-Id: I6bbf1025e35bbc1d2acff747b08c07530bec2b8c
2010-10-21 20:40:11 -07:00
Jeff Hamilton
389a440ad1
Backport ParcelFileDescriptor.createPipe() from master.
...
This allows content providers to expose arbitraty data
through the ContentResolver open* APIs.
Change-Id: I408a0b7cee9cdba5654a962098386c012d6b3549
2010-10-21 22:39:41 -05:00
Dianne Hackborn
bff26d156d
am 86f1b643: am bf5efba2: Merge "Fix issue #3117918 : No way to finish a native activity" into gingerbread
...
Merge commit '86f1b643d10e0b5b17ae01db3b81020db87b3295'
* commit '86f1b643d10e0b5b17ae01db3b81020db87b3295':
Fix issue #3117918 : No way to finish a native activity
2010-10-21 20:27:15 -07:00
Dianne Hackborn
101f14b275
am ba501785: Merge "Implement issue #3116702 : New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
...
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp
* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
Implement issue #3116702 : New manifest tags for supported screen sizes DO NOT MERGE
2010-10-21 20:17:56 -07:00
Dianne Hackborn
86f1b643d1
am bf5efba2: Merge "Fix issue #3117918 : No way to finish a native activity" into gingerbread
...
Merge commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp
* commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc':
Fix issue #3117918 : No way to finish a native activity
2010-10-21 20:17:50 -07:00
Dianne Hackborn
ba501785c7
Merge "Implement issue #3116702 : New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
2010-10-21 19:20:49 -07:00
Dianne Hackborn
bf5efba238
Merge "Fix issue #3117918 : No way to finish a native activity" into gingerbread
2010-10-21 19:09:44 -07:00
Dianne Hackborn
db28a94d49
Fix issue #3117918 : No way to finish a native activity
...
Change-Id: Ic53e712f7ab5412d72a31b96ecba252344b91644
2010-10-21 19:07:37 -07:00
Jeff Brown
4924aee9cb
am 482284ad: am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread
...
Merge commit '482284ad0e3226b49c27bf41442c1cb150853226'
* commit '482284ad0e3226b49c27bf41442c1cb150853226':
Fix a race condition in wallpaper move throttling.
2010-10-21 18:10:24 -07:00
Jeff Brown
482284ad0e
am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread
...
Merge commit '6b3178a6323e015644590ebaee86523e4bb81773' into gingerbread-plus-aosp
* commit '6b3178a6323e015644590ebaee86523e4bb81773':
Fix a race condition in wallpaper move throttling.
2010-10-21 18:05:53 -07:00
Jeff Brown
6b3178a632
Merge "Fix a race condition in wallpaper move throttling." into gingerbread
2010-10-21 18:02:54 -07:00
Dianne Hackborn
c981465aac
am 2f1eee34: am e9dbf208: Merge "Fix issue #3117472 : Format storage dialog still broken" into gingerbread
...
Merge commit '2f1eee34706cf42855541def5737c37a071d7293'
* commit '2f1eee34706cf42855541def5737c37a071d7293':
Fix issue #3117472 : Format storage dialog still broken
2010-10-21 17:44:40 -07:00
Jeff Brown
840db1f678
Fix a race condition in wallpaper move throttling.
...
Bug: 3099316
Change-Id: Ia3221975b5be7fae8359d6ab531bbecd0e29aee9
2010-10-21 17:36:54 -07:00
Dianne Hackborn
2f1eee3470
am e9dbf208: Merge "Fix issue #3117472 : Format storage dialog still broken" into gingerbread
...
Merge commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp
* commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307':
Fix issue #3117472 : Format storage dialog still broken
2010-10-21 17:35:12 -07:00
Dianne Hackborn
e9dbf208e4
Merge "Fix issue #3117472 : Format storage dialog still broken" into gingerbread
2010-10-21 17:28:19 -07:00
Dianne Hackborn
4f6ee254bc
Fix issue #3117472 : Format storage dialog still broken
...
Change-Id: I19b3a04e33785a56cb14457e4e3cd9232f585bb1
2010-10-21 16:39:53 -07:00
Mathias Agopian
46beb43357
am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
...
Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp
* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
Mirror the preview for front-facing cameras. do not merge
2010-10-21 16:26:02 -07:00
Mathias Agopian
0c63605535
Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
2010-10-21 16:20:07 -07:00
Dianne Hackborn
a6d9c7c04c
Implement issue #3116702 : New manifest tags for supported screen sizes DO NOT MERGE
...
Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
2010-10-21 15:32:06 -07:00
Marc Blank
5c167f9191
Merge "Don't stop FlingRunnable when deltaY is rounded to zero"
2010-10-21 15:01:13 -07:00
Chris Tate
1381cac20a
Merge "Report drag success/fail in the DRAG_ENDED message"
2010-10-21 14:46:18 -07:00
Shimeng (Simon) Wang
c5152cad1d
Merge "Let restored scale be in effect."
2010-10-21 14:40:56 -07:00
Chris Tate
d4533f1469
Report drag success/fail in the DRAG_ENDED message
...
DragEvent.getResult() returns 'true' if the drop was ultimately accepted;
false otherwise. The validity of this datum is only guaranteed when the
DragEvent's action verb is ACTION_DRAG_ENDED.
Also fixes the drag-start timeout handling (though the offending app is
not yet officially declared ANR).
Implements bug 3097807
Change-Id: I6908ac628c72ff7d6193d87060d769a559a78d0e
2010-10-21 14:25:06 -07:00
Shimeng (Simon) Wang
8db525a9ad
Let restored scale be in effect.
...
This change reverts some previous change to solve macworld.com scale issue.
issue: 3117312
Change-Id: Id822c7f9c196522a24c0b7657225560dcd0e51e4
2010-10-21 14:20:50 -07:00
Sylvain Fonteneau
82a8a2aa0a
am 4fc9ecf2: am a71354d7: Enable presence check at application level using RawTagConnection.isConnected() method.
...
Merge commit '4fc9ecf223895f09b5593d4bcd2a3f0e2d1f0bae'
* commit '4fc9ecf223895f09b5593d4bcd2a3f0e2d1f0bae':
Enable presence check at application level using
2010-10-21 13:50:20 -07:00
Nick Pelly
886fd91833
am c0e93a84: am 7ea5c45e: NFC settings cleanup.
...
Merge commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a'
* commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a':
NFC settings cleanup.
2010-10-21 13:50:09 -07:00
Brad Fitzpatrick
9509527eb6
am 0c551368: am 15358e14: Merge "Make the base direction of the Arabic error pages RTL"
...
Merge commit '0c55136893849d72ac267f887a841efe845218a1'
* commit '0c55136893849d72ac267f887a841efe845218a1':
Make the base direction of the Arabic error pages RTL
2010-10-21 13:49:41 -07:00
Brad Fitzpatrick
eeacc37b38
am ba1b1c9c: am 6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL"
...
Merge commit 'ba1b1c9c22373737b1ba50a6847b1fbe33999179'
* commit 'ba1b1c9c22373737b1ba50a6847b1fbe33999179':
Set the base direction of the Hebrew error pages to RTL
2010-10-21 13:49:35 -07:00
Jean-Baptiste Queru
276bb3a327
am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp
...
Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342'
* commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342':
Make disabled TextViews uneditable
2010-10-21 13:47:42 -07:00
Dianne Hackborn
46cb1d9602
am 674b856c: am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
...
Merge commit '674b856c15206a23d9d8a22fbd936a4f3055894d'
* commit '674b856c15206a23d9d8a22fbd936a4f3055894d':
Fix java doc on FLAG_EXTERNAL.
2010-10-21 13:47:08 -07:00
Jean-Baptiste Queru
97a0aa987a
am eceace47: 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 'eceace47c575d15a3d4b7cd511c20f86850bf301'
* commit 'eceace47c575d15a3d4b7cd511c20f86850bf301':
Fix FastScroller overlay position bug
2010-10-21 13:46:24 -07:00
Dianne Hackborn
6dcab2099b
am 153bf6c8: am e9e23405: Merge "Fix issue #3113424 : Battery stats don\'t reset on Crespo" into gingerbread
...
Merge commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4'
* commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4':
Fix issue #3113424 : Battery stats don't reset on Crespo
2010-10-21 13:44:47 -07:00
Daniel Lehmann
c2238d0062
Fix default style in constructor with only one parameter
...
Bug:3011901
Change-Id: I6c1b8663ccdfae36d2bb5e63fdc852b6391f3585
2010-10-21 13:37:32 -07:00
Dmitri Plotnikov
beb2178b49
Making multi-values extra in contact INSERT intent public.
...
Change-Id: I27da6278027a8b6a18b8dea756aa4ed8920ec748
2010-10-21 13:31:57 -07:00
Chet Haase
bdccfe4ac4
Merge "Optimizing display lists by referencing pointers to resources instead of copying them"
2010-10-21 13:29:26 -07:00
Marc Blank
299acb5812
Don't stop FlingRunnable when deltaY is rounded to zero
...
Change-Id: I6558d1b2e392c741108ca13da83351eadbce0824
2010-10-21 13:15:34 -07:00
Joe Onorato
f3c3c4fd14
Refactor SystemUI so the status bar isn't a Service of its own.
...
There is now one SystemUIService, which starts the status bar service.
Pretty soon there will be other things running in here too. This way
we don't need to have each of them started by something individually.
This also moves the choice between tablet and phone status bar into
SystemUI.apk, which seems like a much better place for it.
Change-Id: Ib69ef2f43d648764f8dbb52008f5d036a1ee07d9
2010-10-21 15:42:34 -04:00
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
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