Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,723 Commits 3 Branches 0 Tags
f8ca2d71d50c7568e2edd16edeaa3412fa445bd2
Commit Graph

12245 Commits

Author SHA1 Message Date
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
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 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
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
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
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
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