drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,801 Commits 1 Branch 0 Tags
Commit Graph

12271 Commits

Author SHA1 Message Date
Brad Fitzpatrick
1f38636c63 Merge "Expose (internally only) the number of animations currently running." 2010-10-22 16:01:55 -07:00
Brad Fitzpatrick
599ca29986 Expose (internally only) the number of animations currently running. 
This will be used for StrictMode to annotate violations with
whether or not they janked up an animation.

Change-Id: I5bc691f49b74c45279cd2ae044d2a81dcf1204a9
 2010-10-22 15:58:47 -07:00
Shimeng (Simon) Wang
b398fb91eb Merge "Let double tap reflow text." 2010-10-22 15:26:03 -07:00
Shimeng (Simon) Wang
12e343d6b0 Merge "Ignore viewport viewScale in fixed viewport mode." 2010-10-22 15:25:00 -07:00
Gilles Debunne
c17942f7b3 Merge "Fix for 3124993. Crash in Browser on long press." 2010-10-22 14:51:15 -07:00
Dianne Hackborn
e6634981f1 resolved conflicts for merge of 9c7489f8 to master 
Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4
 2010-10-22 14:35:09 -07:00
Gilles Debunne
77f18b0b83 Fix for 3124993. Crash in Browser on long press. 
Change-Id: I88c50e3abd3e3a25f92bcc51163b1ef9e62d2afb
 2010-10-22 14:33:58 -07:00
Shimeng (Simon) Wang
8117e760ee Let double tap reflow text. 
In case when the text wrap scale is out of sync of the zoom scale.

issue:3122512
Change-Id: I9619cc603226503b96e3a0766620bc2884ec1805
 2010-10-22 14:16:28 -07:00
Dianne Hackborn
9c7489f8bd am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread 2010-10-22 14:03:08 -07:00
Brian Carlstrom
998c01e7af Merge "Move improved cert chain handling from CertificateChainValidator to TrustManagerImpl" 2010-10-22 13:02:44 -07:00
Dianne Hackborn
5383f502e4 Fix issue #3122240: Expose xlarge in GB. 
Plus some other small API cleanup.

Change-Id: I1a3c60f510f99224cccac9cc3f838f04141064f8
 2010-10-22 12:59:20 -07:00
Jeff Hamilton
b063e7903e am 8783b0e2: am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread 2010-10-22 12:30:54 -07:00
Jeff Hamilton
8783b0e20c am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread 2010-10-22 12:11:23 -07:00
Jaikumar Ganesh
5a1e4cf83f Update BT APIs return type from Set to List. 
Change-Id: Ia27220dd26cde13007f6938c830517ee7f6968ce
 2010-10-22 11:36:28 -07:00
Jaikumar Ganesh
03cd78cf5e Convert return type of APIs from Set to List. 
Most of the time it will either be empty or have 1 device.
Using list makes it much a better API and since its supported
by the AIDL format, the code becomes much nicer.

Change-Id: I5a2508b33ba754fc8cc738409d658e1235aaf2cf
 2010-10-22 11:36:27 -07:00
Shimeng (Simon) Wang
9c64bae134 Ignore viewport viewScale in fixed viewport mode. 
This is to solve macworld.com, which has 900 as viewport but actual
content width is more 1000.

issue: 3003933
Change-Id: I2db3f66828fd00c8be62131599395eb82752b4a2
 2010-10-22 10:57:44 -07:00
Dmitri Plotnikov
5c1cf3593d Merge "Moving cursor to the end of the search query when set explicitly." 2010-10-22 10:54:51 -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
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
Brian Carlstrom
02ca44b13c Move improved cert chain handling from CertificateChainValidator to TrustManagerImpl 
Bug: 2658463
Change-Id: Iaf27e6b37ad4ad3951ecccc17eab64049bbfaac0
 2010-10-21 23:19:12 -07:00
Jeff Hamilton
da83f513ca Unhide some NFC APIs that are required for the Tag app. 
Change-Id: Ic64e00476132dbf4644de5c465e06fe11a264508
 2010-10-21 23:43:22 -05:00
Dmitri Plotnikov
87c5025fb8 Moving cursor to the end of the search query when set explicitly. 
This situation is encountered in Contacts when the activity
intercepts unsolicited input from the keyboard, takes that
character entered by the user and switches the whole app
to "search mode".  At this time it puts the character
entered by the user in the search field. The user should be
able to continue typing.

Change-Id: Ief40f12bb8f31bced6114d61a0fd95472f21b1be
 2010-10-21 21:16:42 -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
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
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
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
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