Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

38903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
ad3183509c am d4fd86d1: (-s ours) am 468394fc: Text Selection: smart word detection. DO NOT MERGE. 
Merge commit 'd4fd86d19a070a355255b51742075fbf8e69fa4a'

* commit 'd4fd86d19a070a355255b51742075fbf8e69fa4a':
  Text Selection: smart word detection. DO NOT MERGE.
 2010-09-08 10:38:45 -07:00
Elliott Hughes
cfa5903926 am 664c48e9: am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread 
Merge commit '664c48e991a70d07646d54125e97f579f3a33be4'

* commit '664c48e991a70d07646d54125e97f579f3a33be4':
  Remove dead code: NIOBuffer.
 2010-09-08 10:38:41 -07:00
Chung-yih Wang
7e0598d066 am 4f24aed2: am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread 
Merge commit '4f24aed2a13d9ba89e2402894353176e19571e6e'

* commit '4f24aed2a13d9ba89e2402894353176e19571e6e':
  Fix the dialing from contact for internet address.
 2010-09-08 10:38:35 -07:00
Chung-yih Wang
d48a709e3e am 576b492c: am 5de1d36d: Log outbound proxy address if exists for debugging. 
Merge commit '576b492c15a079c9d3d818f3f7fadc4408c2908a'

* commit '576b492c15a079c9d3d818f3f7fadc4408c2908a':
  Log outbound proxy address if exists for debugging.
 2010-09-08 10:35:11 -07:00
Gilles Debunne
d4fd86d19a am 468394fc: Text Selection: smart word detection. DO NOT MERGE. 
Merge commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743' into gingerbread-plus-aosp

* commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743':
  Text Selection: smart word detection. DO NOT MERGE.
 2010-09-08 10:32:42 -07:00
Elliott Hughes
664c48e991 am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread 
Merge commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f' into gingerbread-plus-aosp

* commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f':
  Remove dead code: NIOBuffer.
 2010-09-08 10:32:38 -07:00
Chung-yih Wang
4f24aed2a1 am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread 
Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp

* commit '669070787cc10377c2e5c3fa187babc728d96245':
  Fix the dialing from contact for internet address.
 2010-09-08 10:32:13 -07:00
Jean-Baptiste Queru
980bd4a12d am 84f992a2: resolve conflicts 
Merge commit '84f992a249491b9f755e879bf096baac3f9472f5'

* commit '84f992a249491b9f755e879bf096baac3f9472f5':
  Adding Download Manager Integration, stress, and hosts-based tests.
 2010-09-08 10:28:41 -07:00
Chung-yih Wang
576b492c15 am 5de1d36d: Log outbound proxy address if exists for debugging. 
Merge commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770' into gingerbread-plus-aosp

* commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770':
  Log outbound proxy address if exists for debugging.
 2010-09-08 10:28:09 -07:00
Chet Haase
e6fac0df11 Merge "Rename several animation classes" 2010-09-08 10:25:19 -07:00
Makoto Onuki
c794d4ba19 Merge "Added "Memory observability" to javadoc." 2010-09-08 10:14:01 -07:00
Makoto Onuki
aa60a02f79 Added "Memory observability" to javadoc. 
Change-Id: I4fba91922f033af408903cc4b455daa291e3f6ac
 2010-09-08 10:06:19 -07:00
Jean-Baptiste Queru
84f992a249 resolve conflicts 
Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1
 2010-09-08 10:02:35 -07:00
Gilles Debunne
d9b4c84a4a Merge "Made text selection work in ExtractEditText. Manual merge of Gingerbread 64947." 2010-09-08 10:01:46 -07:00
Mike Lockwood
3b2a62e5b3 Rename the media database's "objects" table to "files" 
We will be using this table for more than just MTP,
so it deserves a more general name.

Change-Id: I4c86d7e37ebe778e39699245b0e08af059e677ea
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-08 12:47:57 -04:00
Gilles Debunne
468394fc6d Text Selection: smart word detection. DO NOT MERGE. 
Selecting between words selects the spaces instead of the closest word, facilitating
paste insertion vs word replacement.

Pasting adds/removes space before and after if needed so that pasted text is not appended to
existing text.

Cut and copy not available when selection is empty.

Change-Id: I331413bdef341a4eceffe76fa2957f388d540b6e
 2010-09-08 09:43:46 -07:00
Chet Haase
a18a86b43e Rename several animation classes 
Change-Id: I6a4544875090db485163c8d56de8718f56d267c7
 2010-09-08 09:41:21 -07:00
Gilles Debunne
64e54a6e1f Made text selection work in ExtractEditText. Manual merge of Gingerbread 64947. 
Change-Id: I2bbd4cd7abbc77212fb4df256c345f95232de127
 2010-09-08 09:38:47 -07:00
Lorenzo Colitti
c3a5cf07d1 Merge "Framework changes for IPv6 / IPv4v6 data calls." 2010-09-08 09:30:45 -07:00
Elliott Hughes
4c7d3f2889 Merge "Remove dead code: NIOBuffer." into gingerbread 2010-09-08 09:30:41 -07:00
Mike Lockwood
789a47488c Merge "Fix Intent.ACTION_REBOOT" 2010-09-08 06:52:51 -07:00
Mike Lockwood
b8a8a578c2 Fix Intent.ACTION_REBOOT 
Turns out this would be useful for automated testing.

Change-Id: Idd5e35a8d4a354447b17a77fe0b606f78df844d0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-08 07:47:03 -04:00
Chung-yih Wang
669070787c Merge "Fix the dialing from contact for internet address." into gingerbread 2010-09-08 03:32:01 -07:00
Chung-yih Wang
6f0f870f16 Fix the dialing from contact for internet address. 
the bug is http://b/issue?id=2982290

+Log outbound proxy address if exists for debugging.
 2010-09-08 18:26:05 +08:00
Steve Block
aaa9675b5c Merge "Update DumpRenderTree2 to reflect removal of WEBKIT_MERGE_REVISION" 2010-09-08 03:20:13 -07:00
Brad Fitzpatrick
3dd42334ee Don't block in the BackupManagerService.dataChanged() Binder call. 
This unnecessarily blocks callers.

Bug: 2977348
Change-Id: I5267e575cdd5eb2136379f9710126b62a1bd75ad
 2010-09-07 23:40:30 -07:00
Ying Wang
db09da1071 Merge "Reflected class name and bc file name changes." 2010-09-07 22:28:20 -07:00
Vasu Nori
441fcf13f3 remove some useless code and add some code to aid in debugging 
Change-Id: Ie532848b82dde57cc7a7017661679ece06ca606e
 2010-09-07 22:18:31 -07:00
Chung-yih Wang
5de1d36dd0 Log outbound proxy address if exists for debugging. 
Change-Id: I2d2dffe3536e674b6956164c400e397c2f00f212
 2010-09-08 13:15:55 +08:00
Wei-Ta Chen
7b29804ba2 am 8fc6f8b2: am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread 
Merge commit '8fc6f8b2152564cab6ede025644f9bc3ee61ce16'

* commit '8fc6f8b2152564cab6ede025644f9bc3ee61ce16':
  Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
 2010-09-07 22:10:58 -07:00
Gilles Debunne
4a070cd002 am e0974284: am d6e56895: update-api step missing from 64963. 
Merge commit 'e0974284a8983524c8719a47e57395f0030c3128'

* commit 'e0974284a8983524c8719a47e57395f0030c3128':
  update-api step missing from 64963.
 2010-09-07 22:10:45 -07:00
Brad Fitzpatrick
0486f78ef3 am b1657b2b: resolved conflicts for merge of 64591009 to gingerbread-plus-aosp 
Merge commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d'

* commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d':
  Fix a race between requesting/loading/writing SharedPreferences.
 2010-09-07 22:10:41 -07:00
Wei-Ta Chen
8fc6f8b215 am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread 
Merge commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49' into gingerbread-plus-aosp

* commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49':
  Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
 2010-09-07 21:48:48 -07:00
Gilles Debunne
e0974284a8 am d6e56895: update-api step missing from 64963. 
Merge commit 'd6e56895f647d3c6ea33cea15fdb7b1e9ff3f537' into gingerbread-plus-aosp

* commit 'd6e56895f647d3c6ea33cea15fdb7b1e9ff3f537':
  update-api step missing from 64963.
 2010-09-07 21:48:39 -07:00
Brad Fitzpatrick
b1657b2bd6 resolved conflicts for merge of 64591009 to gingerbread-plus-aosp 
Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e
 2010-09-07 21:41:09 -07:00
Adam Powell
9b717b5e53 Merge "Reworking the ActionBar tab API" 2010-09-07 21:04:54 -07:00
Adam Powell
2b6230e0de Reworking the ActionBar tab API 
Change-Id: Ifbcdc61b4a24633cc1a329c73923b95b03e9ecf0
 2010-09-07 21:02:12 -07:00
Guang Zhu
0ad6fdc029 Merge "temporarily skip simple-cross-origin-progress-events.html for now" 2010-09-07 21:00:32 -07:00
Guang Zhu
70795b3add temporarily skip simple-cross-origin-progress-events.html for now 
this test crashes on Passion, and runs webcore into a bad state on
Stingray. To make sure it does not block the entire layout test
suite on Stingray, skipping this test for now.
http://b/2982500

Change-Id: Id4875112705df9b2c5b003a2c32c292765ab17fc
 2010-09-07 20:58:24 -07:00
Neal Nguyen
6aec225010 Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread 2010-09-07 20:55:22 -07:00
Wei-Ta Chen
1b214be92a Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread 2010-09-07 20:36:13 -07:00
Gilles Debunne
d6e56895f6 update-api step missing from 64963. 
Change-Id: I7e91aa9830c19bbb4115ae3a236345b220dc9eb0
 2010-09-07 20:29:42 -07:00
Brad Fitzpatrick
6459100940 Merge "Fix a race between requesting/loading/writing SharedPreferences." into gingerbread 2010-09-07 20:06:26 -07:00
Lorenzo Colitti
b60c9ba335 Framework changes for IPv6 / IPv4v6 data calls. 
Change-Id: I172fbcf3fcc4af3822aa16afac7015e675ccd007
 2010-09-07 19:46:23 -07:00
Wei-Ta Chen
340ce75b44 Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API." 
This reverts commit 50ba3d2c09.
 2010-09-08 10:44:21 +08:00
Hung-ying Tyan
8fbc471199 am f870ee81: am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread 
Merge commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0'

* commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0':
  SipPhone: switch to its own phone type PHONE_TYPE_SIP.
 2010-09-07 19:43:33 -07:00
Kenny Root
a009dde6f4 am 2a08e2a9: am a19ef306: Revert "Free created FileMap when uncompressing files" 
Merge commit '2a08e2a9f881d06a03e36367585137e05706f592'

* commit '2a08e2a9f881d06a03e36367585137e05706f592':
  Revert "Free created FileMap when uncompressing files"
 2010-09-07 19:41:00 -07:00
Hung-ying Tyan
f870ee8108 am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread 
Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp

* commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b':
  SipPhone: switch to its own phone type PHONE_TYPE_SIP.
 2010-09-07 19:40:40 -07:00
Hung-ying Tyan
d580eee29b Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread 2010-09-07 19:37:33 -07:00
Kenny Root
2a08e2a9f8 am a19ef306: Revert "Free created FileMap when uncompressing files" 
Merge commit 'a19ef306bd0a257c67b50f5e0e669e9fe52b0889' into gingerbread-plus-aosp

* commit 'a19ef306bd0a257c67b50f5e0e669e9fe52b0889':
  Revert "Free created FileMap when uncompressing files"
 2010-09-07 19:35:47 -07:00