Commit Graph

26507 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
2cc595af65 Revert "resolve conflicts"
This reverts commit 84f992a249.
2010-09-08 11:01:40 -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
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
Jean-Baptiste Queru
84f992a249 resolve conflicts
Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1
2010-09-08 10:02:35 -07: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
Elliott Hughes
4c7d3f2889 Merge "Remove dead code: NIOBuffer." into gingerbread 2010-09-08 09:30:41 -07: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
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
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
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
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
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
Kenny Root
a19ef306bd Revert "Free created FileMap when uncompressing files"
This reverts commit 52b8235238.

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
cf86bc1d92 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
2ae3718b44 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
883bbb7228 Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread 2010-09-07 18:53:55 -07:00
Gilles Debunne
49271c941e Hide mCursorController field in ArrowKeyMovementMethod.
Made the field private and added a description of its use.

Bug http://b/issue?id=2975284

Change-Id: Id8acf756218915cb2ae756789b62cfe7201a5c67
2010-09-07 18:32:28 -07:00
Gilles Debunne
dbd25cdbc3 Made text selection work in ExtractEditText. DO NOT MERGE
Change insertion point on tap is no longer handled by the CommitSelectionReceiver
(as it is not called by ExtractEditText).

Fixed a bug to handle drawing positions when the internal TextView scroller is used.

Change-Id: I87398c7109c5527d21dee6abbdb925848244d594
2010-09-07 18:07:30 -07:00
Brad Fitzpatrick
6194c53754 Fix a race between requesting/loading/writing SharedPreferences.
Part of the race existed before, but it was made much worse with
apply().

Corresponding CTS test is Icc6e638a6a

Change-Id: Ic5cfa467fb7f1859cb7b44d417412219c0621965
2010-09-07 18:00:33 -07:00
Dmitry Shmidt
59a5d2d577 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
d0f74ae081 Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread 2010-09-07 17:29:45 -07:00
Wei-Ta Chen
a295a3908b am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
Merge commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628' into gingerbread-plus-aosp

* commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628':
  Rename LargeBitmap to BitmapRegionDecoder for having a better API.
2010-09-07 17:07:12 -07:00
Wei-Ta Chen
b356f8acec Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread 2010-09-07 17:01:57 -07:00
Irfan Sheriff
1907bd2f6c Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
Bug: 2973101
Change-Id: I874381eeb12bb796382717285750d700e9b181ce
2010-09-07 16:42:38 -07:00
Dianne Hackborn
a1205f07a6 am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp

* commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea':
  Modify native ALooper to take an explicit ident.
2010-09-07 16:38:45 -07:00
Dianne Hackborn
2d3739d479 Merge "Modify native ALooper to take an explicit ident." into gingerbread 2010-09-07 16:32:48 -07:00
Dianne Hackborn
42c03e579a Modify native ALooper to take an explicit ident.
The ALooper API now uses an explicit "identifier" for the integer
that is returned rather than implicitly using the fd.  This allows
the APIs that had the fd to be a little more sane.

Change-Id: I8507f535ad484c0bdc4a1bd016d87bb09acd7ff0
2010-09-07 15:46:55 -07:00
Elliott Hughes
edf7223bc2 Remove dead code: NIOBuffer.
Working on speeding up our NIO implementation, I came across this suboptimal
code. Happily, it turns out to be unused.

Bug: 2935622
Change-Id: I07ae6e573d63e439f496d55af215b34598d8258a
2010-09-07 15:42:23 -07:00
Kenny Root
000ef46f5b am 25429378: Merge "Allow installd to handle large partitions" into gingerbread
Merge commit '254293782a94652fd601d6b3f04ad447c072f714' into gingerbread-plus-aosp

* commit '254293782a94652fd601d6b3f04ad447c072f714':
  Allow installd to handle large partitions
2010-09-07 15:42:02 -07:00
Kenny Root
254293782a Merge "Allow installd to handle large partitions" into gingerbread 2010-09-07 15:38:31 -07:00
Elliott Hughes
c50a4f374a am 45cda90b: Merge "Be brief." into gingerbread
Merge commit '45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp

* commit '45cda90bdc178e253049c7067c78bf4b1204ba82':
  Be brief.
2010-09-07 14:46:15 -07:00
Joe Onorato
d348ea6e0a am 1f6a21c2: Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread
Merge commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d' into gingerbread-plus-aosp

* commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d':
  Expose the TextAppearance.StatusBar.* styles.
2010-09-07 14:46:08 -07:00
Elliott Hughes
45cda90bdc Merge "Be brief." into gingerbread 2010-09-07 14:41:36 -07:00
Joe Onorato
1f6a21c237 Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread 2010-09-07 14:41:12 -07:00
Kenny Root
3e319a9962 Allow installd to handle large partitions
Use int64_t because we're RPCing over to Java which uses a Long to
represent the filesystem space.

Change-Id: I842b2cf9f2ff8f980ff5895c1c8eb9ebefa1ea31
2010-09-07 14:35:47 -07:00
Makoto Onuki
3f6e4d56bb am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
Merge commit '1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp

* commit '1cc86da61a361c84ef81e893440c500e33fae312':
  Don't fall through from TOKEN_EMAIL_LOOKUP
2010-09-07 14:34:19 -07:00
Makoto Onuki
1cc86da61a Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 2010-09-07 14:31:34 -07:00
Neal Nguyen
40ef0f49ea Adding Download Manager Integration, stress, and hosts-based tests.
Change-Id: If75021380f4aee9c650f6e34093779e85cc4e5d8
2010-09-07 14:27:16 -07:00
Dianne Hackborn
75f0024cf4 am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
Merge commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp

* commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
  Fixes to battery stats debug output.
2010-09-07 14:15:17 -07:00
Joe Onorato
ccfc1c1ea1 Expose the TextAppearance.StatusBar.* styles.
Change-Id: I6e1e68ab26495290d480f4fb75facedd6cd62908
2010-09-07 17:12:10 -04:00