summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | am 76616b13: Merge "Scolling using arrow keys with padding"Conley Owens2011-04-295-6/+132
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge "Scolling using arrow keys with padding"Conley Owens2011-04-295-6/+132
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Scolling using arrow keys with paddingMattias Petersson2011-04-075-6/+132
* | | | | | | | | | | | | | | | Merge commit 'f395e304' into mConley Owens2011-05-022-3/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null str...Conley Owens2011-04-292-3/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"Conley Owens2011-04-292-3/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"Conley Owens2011-04-292-3/+55
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | CHAR_SEQUENCE_CREATOR cannot handle null stringMartin Wallgren2011-04-072-3/+55
| | | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | | am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when load...Conley Owens2011-05-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is ...Conley Owens2011-04-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at fir...Conley Owens2011-04-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge "Fixed to draw texture when loadTexture() is called at first time"Conley Owens2011-04-291-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Fixed to draw texture when loadTexture() is called at first timeIchitaro Kohara2011-04-051-1/+1
* | | | | | | | | | | | | | | | am 737b5c58: am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone for...Conley Owens2011-05-021-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter."Conley Owens2011-04-291-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 9355a24a: Merge "Fixing wrong Japanese phone formatter."Conley Owens2011-04-291-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge "Fixing wrong Japanese phone formatter."Conley Owens2011-04-291-3/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Fixing wrong Japanese phone formatter.Keiji Ariyama2011-03-111-3/+5
* | | | | | | | | | | | | | | | | am 1eb31b43: am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class"Conley Owens2011-05-022-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class"Conley Owens2011-04-292-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 9fd8e057: Merge "Fix memory leak of SkMovie class"Conley Owens2011-04-292-0/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge "Fix memory leak of SkMovie class"Conley Owens2011-04-292-0/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Fix memory leak of SkMovie classKimiyoshi Kusaka2011-03-282-0/+16
* | | | | | | | | | | | | | | | | | am 64248af3: Ignore ALT and SHIFT modifiers since they now exist in libs/ui/K...Conley Owens2011-05-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMa...Conley Owens2011-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am 8ebf3558: Merge "Implement support for ALT and SHIFT modifiers"Conley Owens2011-04-291-0/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Merge "Implement support for ALT and SHIFT modifiers"Conley Owens2011-04-291-0/+22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Implement support for ALT and SHIFT modifiersJohan Redestig2011-03-081-0/+22
| | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am c30d7676: am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Di...Conley Owens2011-05-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because...Conley Owens2011-04-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing sea...Conley Owens2011-04-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Merge "Fix startSearch condition on Dialog, because pressing search key cause...Conley Owens2011-04-291-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Fix startSearch condition on Dialog, because pressing search key causes ANR p...lge-aosp2011-03-151-1/+1
* | | | | | | | | | | | | | | | | | | am faedfc1e: Ignore slide ui change because it is obselete in newly-refactore...Conley Owens2011-05-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Ignore slide ui change because it is obselete in newly-refactored codeConley Owens2011-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | am 1ecd0a9b: Merge "modify the device to enable to get the state as slide-ope...Conley Owens2011-04-291-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | Merge "modify the device to enable to get the state as slide-open/slide-close."Conley Owens2011-04-291-6/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | modify the device to enable to get the state as slide-open/slide-close.nao2011-03-311-6/+6
* | | | | | | | | | | | | | | | | | | | am 238ef85e: am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurf...Conley Owens2011-05-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::...Conley Owens2011-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact"Conley Owens2011-04-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | Merge "Adding missing breaks in BnSurfaceComposer::onTransact"Conley Owens2011-04-290-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Adding missing breaks in BnSurfaceComposer::onTransactFredrik Lanker2011-01-121-2/+2
* | | | | | | | | | | | | | | | | | | | | am 0921eae1: Ignore fix since it is obsolete in newly refactored codeConley Owens2011-05-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Ignore fix since it is obsolete in newly refactored codeConley Owens2011-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | am 7ae9f08a: Merge "Fixed to call computeVisibleRegions() when transparent va...Conley Owens2011-04-291-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | Merge "Fixed to call computeVisibleRegions() when transparent value changed"Conley Owens2011-04-291-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | Fixed to call computeVisibleRegions() when transparent value changedIchitaro Kohara2011-02-171-0/+3
* | | | | | | | | | | | | | | | | | | | | | am 92618f5f: am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock o...Conley Owens2011-05-021-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only whe...Conley Owens2011-04-291-4/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /