summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "resolve conflicts"Jean-Baptiste Queru2010-09-0815-3053/+8
| | | | This reverts commit 84f992a249491b9f755e879bf096baac3f9472f5.
* am 468394fc: Text Selection: smart word detection. DO NOT MERGE.Gilles Debunne2010-09-081-11/+87
|\ | | | | | | | | | | | | Merge commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743' into gingerbread-plus-aosp * commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743': Text Selection: smart word detection. DO NOT MERGE.
| * Text Selection: smart word detection. DO NOT MERGE.Gilles Debunne2010-09-081-11/+87
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbreadElliott Hughes2010-09-084-174/+0
|\ \ | |/ | | | | | | | | | | Merge commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f' into gingerbread-plus-aosp * commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f': Remove dead code: NIOBuffer.
| * Merge "Remove dead code: NIOBuffer." into gingerbreadElliott Hughes2010-09-084-174/+0
| |\
| | * Remove dead code: NIOBuffer.Elliott Hughes2010-09-074-174/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 66907078: Merge "Fix the dialing from contact for internet address." into ↵Chung-yih Wang2010-09-081-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp * commit '669070787cc10377c2e5c3fa187babc728d96245': Fix the dialing from contact for internet address.
| * | Merge "Fix the dialing from contact for internet address." into gingerbreadChung-yih Wang2010-09-081-1/+1
| |\ \
| | * | Fix the dialing from contact for internet address.Chung-yih Wang2010-09-082-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | the bug is http://b/issue?id=2982290 +Log outbound proxy address if exists for debugging.
* | | | am 5de1d36d: Log outbound proxy address if exists for debugging.Chung-yih Wang2010-09-081-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770' into gingerbread-plus-aosp * commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770': Log outbound proxy address if exists for debugging.
| * | | Log outbound proxy address if exists for debugging.Chung-yih Wang2010-09-081-0/+1
| |/ / | | | | | | | | | Change-Id: I2d2dffe3536e674b6956164c400e397c2f00f212
* | | resolve conflictsJean-Baptiste Queru2010-09-0815-8/+3053
|\ \ \ | |/ / | | | | | | Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1
| * | Merge "Adding Download Manager Integration, stress, and hosts-based tests." ↵Neal Nguyen2010-09-0715-6/+3052
| |\ \ | | | | | | | | | | | | into gingerbread
| | * | Adding Download Manager Integration, stress, and hosts-based tests.Neal Nguyen2010-09-0715-6/+3052
| | | | | | | | | | | | | | | | Change-Id: If75021380f4aee9c650f6e34093779e85cc4e5d8
* | | | am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for ↵Wei-Ta Chen2010-09-0710-693/+347
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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."
| * | | Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better ↵Wei-Ta Chen2010-09-0710-693/+347
| |\ \ \ | | | | | | | | | | | | | | | API."" into gingerbread
| | * | | Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."Wei-Ta Chen2010-09-0810-693/+347
| | | | | | | | | | | | | | | | | | | | This reverts commit 50ba3d2c09a9131f3578d271adf2bc8258ca1742.
* | | | | am d6e56895: update-api step missing from 64963.Gilles Debunne2010-09-071-10/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd6e56895f647d3c6ea33cea15fdb7b1e9ff3f537' into gingerbread-plus-aosp * commit 'd6e56895f647d3c6ea33cea15fdb7b1e9ff3f537': update-api step missing from 64963.
| * | | | update-api step missing from 64963.Gilles Debunne2010-09-071-10/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I7e91aa9830c19bbb4115ae3a236345b220dc9eb0
* | | | | resolved conflicts for merge of 64591009 to gingerbread-plus-aospBrad Fitzpatrick2010-09-071-39/+62
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e
| * | | | Merge "Fix a race between requesting/loading/writing SharedPreferences." ↵Brad Fitzpatrick2010-09-071-41/+63
| |\ \ \ \ | | |/ / / | |/| | | | | | | | into gingerbread
| | * | | Fix a race between requesting/loading/writing SharedPreferences.Brad Fitzpatrick2010-09-071-41/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of the race existed before, but it was made much worse with apply(). Corresponding CTS test is Icc6e638a6a Change-Id: Ic5cfa467fb7f1859cb7b44d417412219c0621965
* | | | | am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." ↵Hung-ying Tyan2010-09-071-2/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp * commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b': SipPhone: switch to its own phone type PHONE_TYPE_SIP.
| * | | | Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbreadHung-ying Tyan2010-09-071-2/+1
| |\ \ \ \
| | * | | | SipPhone: switch to its own phone type PHONE_TYPE_SIP.Hung-ying Tyan2010-09-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie33cfe92e59665864dbebbb38895e8e85f6db2e6
* | | | | | am a19ef306: Revert "Free created FileMap when uncompressing files"Kenny Root2010-09-071-9/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a19ef306bd0a257c67b50f5e0e669e9fe52b0889' into gingerbread-plus-aosp * commit 'a19ef306bd0a257c67b50f5e0e669e9fe52b0889': Revert "Free created FileMap when uncompressing files"
| * | | | | Revert "Free created FileMap when uncompressing files"Kenny Root2010-09-071-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | am 883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." ↵Gilles Debunne2010-09-071-2/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '883bbb72284736b5601f9e96d1116969c51b75de' into gingerbread-plus-aosp * commit '883bbb72284736b5601f9e96d1116969c51b75de': Hide mCursorController field in ArrowKeyMovementMethod.
| * | | | | Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbreadGilles Debunne2010-09-071-2/+12
| |\ \ \ \ \
| | * | | | | Hide mCursorController field in ArrowKeyMovementMethod.Gilles Debunne2010-09-071-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made the field private and added a description of its use. Bug http://b/issue?id=2975284 Change-Id: Id8acf756218915cb2ae756789b62cfe7201a5c67
* | | | | | | am dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGEGilles Debunne2010-09-073-102/+119
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e' into gingerbread-plus-aosp * commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e': Made text selection work in ExtractEditText. DO NOT MERGE
| * | | | | | Made text selection work in ExtractEditText. DO NOT MERGEGilles Debunne2010-09-073-102/+119
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into ↵Dmitry Shmidt2010-09-071-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'd0f74ae081bac9a9c8f7faf9288305647735d743' into gingerbread-plus-aosp * commit 'd0f74ae081bac9a9c8f7faf9288305647735d743': Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
| * | | | | Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbreadDmitry Shmidt2010-09-071-1/+1
| |\ \ \ \ \
| | * | | | | Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGEIrfan Sheriff2010-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2973101 Change-Id: I874381eeb12bb796382717285750d700e9b181ce
* | | | | | | am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a ↵Wei-Ta Chen2010-09-0710-347/+693
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | better API." into gingerbread Merge commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628' into gingerbread-plus-aosp * commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628': Rename LargeBitmap to BitmapRegionDecoder for having a better API.
| * | | | | | Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." ↵Wei-Ta Chen2010-09-0710-347/+693
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | * | | | | | Rename LargeBitmap to BitmapRegionDecoder for having a better API.Wei-Ta Chen2010-09-0710-347/+693
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions. Change-Id: I3e60c7fe4abd0289e1384e69a08fd20fe6fb0e10
* | | | | | | am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into ↵Dianne Hackborn2010-09-0711-30/+48
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp * commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea': Modify native ALooper to take an explicit ident.
| * | | | | | Merge "Modify native ALooper to take an explicit ident." into gingerbreadDianne Hackborn2010-09-0711-30/+48
| |\ \ \ \ \ \
| | * | | | | | Modify native ALooper to take an explicit ident.Dianne Hackborn2010-09-0711-30/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am 25429378: Merge "Allow installd to handle large partitions" into gingerbreadKenny Root2010-09-073-21/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '254293782a94652fd601d6b3f04ad447c072f714' into gingerbread-plus-aosp * commit '254293782a94652fd601d6b3f04ad447c072f714': Allow installd to handle large partitions
| * | | | | | | Merge "Allow installd to handle large partitions" into gingerbreadKenny Root2010-09-073-21/+27
| |\ \ \ \ \ \ \
| | * | | | | | | Allow installd to handle large partitionsKenny Root2010-09-073-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use int64_t because we're RPCing over to Java which uses a Long to represent the filesystem space. Change-Id: I842b2cf9f2ff8f980ff5895c1c8eb9ebefa1ea31
* | | | | | | | | am 45cda90b: Merge "Be brief." into gingerbreadElliott Hughes2010-09-071-182/+41
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp * commit '45cda90bdc178e253049c7067c78bf4b1204ba82': Be brief.
| * | | | | | | | Merge "Be brief." into gingerbreadElliott Hughes2010-09-071-182/+41
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Be brief.Elliott Hughes2010-07-281-182/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Excise much of the non-Android blurb so we don't distract from our primary messages of "allocate less stuff" and "do less work". Change-Id: Ifc2c12bc953dbfbaf4078d4f7b77aa75d1d942d7
* | | | | | | | | | am 1f6a21c2: Merge "Expose the TextAppearance.StatusBar.* styles." into ↵Joe Onorato2010-09-072-44/+50
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d' into gingerbread-plus-aosp * commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d': Expose the TextAppearance.StatusBar.* styles.
| * | | | | | | | | Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbreadJoe Onorato2010-09-072-44/+50
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Expose the TextAppearance.StatusBar.* styles.Joe Onorato2010-09-072-44/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6e1e68ab26495290d480f4fb75facedd6cd62908
generated by cgit v1.1 at 2025-02-04 19:00:53 +0000