ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
20,603 Commits 2 Branches 0 Tags 54 MiB
31af5348b0
Commit Graph

20603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
31af5348b0 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
fb3d25d917 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
370ff2cd7f 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
ca88a80015 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
486d70d27a 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
3077e21d2b 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
fd857d1589 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
f3c06fd804 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
205b84897c 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
398143d919 Merge "Rename several animation classes" 2010-09-08 10:25:19 -07:00
Makoto Onuki
fb4ccaf69c Merge "Added "Memory observability" to javadoc." 2010-09-08 10:14:01 -07:00
Jean-Baptiste Queru
0e1ce57218 resolve conflicts 
Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1
 2010-09-08 10:02:35 -07:00
Gilles Debunne
ba67e34566 Merge "Made text selection work in ExtractEditText. Manual merge of Gingerbread 64947." 2010-09-08 10:01:46 -07:00
Lorenzo Colitti
c823988f3f Merge "Framework changes for IPv6 / IPv4v6 data calls." 2010-09-08 09:30:45 -07:00
Elliott Hughes
1edbc7e431 Merge "Remove dead code: NIOBuffer." into gingerbread 2010-09-08 09:30:41 -07:00
Mike Lockwood
93ab4fac68 Merge "Fix Intent.ACTION_REBOOT" 2010-09-08 06:52:51 -07:00
Chung-yih Wang
0f55fb95d4 Merge "Fix the dialing from contact for internet address." into gingerbread 2010-09-08 03:32:01 -07:00
Steve Block
fdbf9a788a Merge "Update DumpRenderTree2 to reflect removal of WEBKIT_MERGE_REVISION" 2010-09-08 03:20:13 -07:00
Ying Wang
c9956d9d9c Merge "Reflected class name and bc file name changes." 2010-09-07 22:28:20 -07:00
Wei-Ta Chen
d267df27cd 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
db607de4cc 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
e84e02ec59 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
8b0de0ee31 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
0dfd31013b 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
6eba882d83 resolved conflicts for merge of 64591009 to gingerbread-plus-aosp 
Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e
 2010-09-07 21:41:09 -07:00
Adam Powell
f6eb6915ad Merge "Reworking the ActionBar tab API" 2010-09-07 21:04:54 -07:00
Guang Zhu
988e3190d5 Merge "temporarily skip simple-cross-origin-progress-events.html for now" 2010-09-07 21:00:32 -07:00
Neal Nguyen
e1446fa12e Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread 2010-09-07 20:55:22 -07:00
Wei-Ta Chen
731e3428fb Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread 2010-09-07 20:36:13 -07:00
Brad Fitzpatrick
9a994a0796 Merge "Fix a race between requesting/loading/writing SharedPreferences." into gingerbread 2010-09-07 20:06:26 -07:00
Hung-ying Tyan
aabcf6197f 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
16ead4738c 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
b4dab55191 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
3386566558 Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread 2010-09-07 19:37:33 -07:00
Kenny Root
c41ba2bd56 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
Kenny Root
dc2d840ff7 Revert "Free created FileMap when uncompressing files" 
This reverts commit 52b8235238fb4d8cf141020cc1ae33880929dc3f.

munmap() on a region that overlaps something else (e.g, the ZIP Central
Directory in this case) unmaps those other regions as well making the
ZipFileRO class unhappy. Revert this for now until we can have FileMap
deal with this craziness.
 2010-09-07 19:30:22 -07:00
Gilles Debunne
80d65d273f am cf86bc1d: am 883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread 
Merge commit 'cf86bc1d92128455c06ed8b0a338e7b3145d11a7'

* commit 'cf86bc1d92128455c06ed8b0a338e7b3145d11a7':
  Hide mCursorController field in ArrowKeyMovementMethod.
 2010-09-07 19:05:18 -07:00
Gilles Debunne
620533a901 am 2ae3718b: (-s ours) am dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGE 
Merge commit '2ae3718b448cdc5e94b4686795301a01f54640e4'

* commit '2ae3718b448cdc5e94b4686795301a01f54640e4':
  Made text selection work in ExtractEditText. DO NOT MERGE
 2010-09-07 19:05:11 -07:00
Gilles Debunne
e050c1fe16 am 883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread 
Merge commit '883bbb72284736b5601f9e96d1116969c51b75de' into gingerbread-plus-aosp

* commit '883bbb72284736b5601f9e96d1116969c51b75de':
  Hide mCursorController field in ArrowKeyMovementMethod.
 2010-09-07 18:59:22 -07:00
Gilles Debunne
55ca8a544f am dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGE 
Merge commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e' into gingerbread-plus-aosp

* commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e':
  Made text selection work in ExtractEditText. DO NOT MERGE
 2010-09-07 18:59:10 -07:00
Gilles Debunne
cfaf307ec5 Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread 2010-09-07 18:53:55 -07:00
Dmitry Shmidt
6a4939a4b1 am 59a5d2d5: (-s ours) am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread 
Merge commit '59a5d2d5772f41578c72f48df08c0af918b6519c'

* commit '59a5d2d5772f41578c72f48df08c0af918b6519c':
  Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
 2010-09-07 18:52:40 -07:00
Wei-Ta Chen
92f0724d06 am a295a390: am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread 
Merge commit 'a295a3908befeb9dd30203c612d95411d68492ed'

* commit 'a295a3908befeb9dd30203c612d95411d68492ed':
  Rename LargeBitmap to BitmapRegionDecoder for having a better API.
 2010-09-07 18:52:21 -07:00
Dianne Hackborn
c946422d58 am a1205f07: am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread 
Merge commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7'

* commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7':
  Modify native ALooper to take an explicit ident.
 2010-09-07 18:52:06 -07:00
Kenny Root
427893e333 am 000ef46f: am 25429378: Merge "Allow installd to handle large partitions" into gingerbread 
Merge commit '000ef46f5b0f84d08342711b00e8de560ea504af'

* commit '000ef46f5b0f84d08342711b00e8de560ea504af':
  Allow installd to handle large partitions
 2010-09-07 18:51:53 -07:00
Elliott Hughes
5815c97cbf am c50a4f37: am 45cda90b: Merge "Be brief." into gingerbread 
Merge commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77'

* commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77':
  Be brief.
 2010-09-07 18:51:16 -07:00
Ying Wang
e00b371d62 Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge 
Conflicts:
	core/res/res/values/public.xml

Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1
 2010-09-07 18:39:03 -07:00
Dmitry Shmidt
77b534aab2 am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread 
Merge commit 'd0f74ae081bac9a9c8f7faf9288305647735d743' into gingerbread-plus-aosp

* commit 'd0f74ae081bac9a9c8f7faf9288305647735d743':
  Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
 2010-09-07 17:33:55 -07:00
Dmitry Shmidt
f0b9cf3d6a Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread 2010-09-07 17:29:45 -07:00
Romain Guy
67a565f00c Merge "Correctly set the viewport on window resize." 2010-09-07 17:17:12 -07:00