summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* AccessoryChat: use platform APIs and support Galaxy NexusSimon Wilson2012-02-074-13/+11
| | | | Change-Id: I171c2781f3d447bec46f0179351e1b18721b1b89
* Merge "Return information about whether overlays are disabled."Dianne Hackborn2012-02-071-0/+1
|\
| * Return information about whether overlays are disabled.Dianne Hackborn2012-02-061-0/+1
| | | | | | | | Change-Id: I85ae42e9f28461f5142cc6b3c8e25ff3f195805a
* | Merge "Only generate private symbols that are needed."Dianne Hackborn2012-02-077-10/+1709
|\ \
| * | Only generate private symbols that are needed.Dianne Hackborn2012-02-077-10/+1709
| | | | | | | | | | | | Change-Id: Icc4c86638db8429a387bf87c934cc712f807e213
* | | Merge "Adding a method for retching the root node in UiTestAutomationBridge"Svetoslav Ganov2012-02-072-1/+58
|\ \ \ | |/ / |/| |
| * | Adding a method for retching the root node in UiTestAutomationBridgeSvetoslav Ganov2012-02-072-1/+58
| | | | | | | | | | | | | | | | | | bug:5974791 Change-Id: I46a8b6a259ba31f27fcd6a71d06dc34efdb4de76
* | | Merge "List rotated netstats files during --checkin dump."Jeff Sharkey2012-02-071-3/+14
|\ \ \
| * | | List rotated netstats files during --checkin dump.Jeff Sharkey2012-02-061-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | Also disable verbose logging. Change-Id: I4c51e05d695eac43f0d9c28f9699f1655c642a99
* | | | Merge "MatroskaExtractor: to support MPEG4 and MP3 codec."Andreas Huber2012-02-071-12/+32
|\ \ \ \
| * | | | MatroskaExtractor: to support MPEG4 and MP3 codec.Dongwon Kang2012-01-151-12/+32
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic7ffb3ed394b233336fbf2a7b2627ee27033a59e
* | | | | am 6668958c: am 1bd8111b: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-070-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | * commit '6668958cbe9aca2c8930020e9acad9ef1bf045a8':
| * \ \ \ \ am 1bd8111b: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-070-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | * commit '1bd8111bbc62278d5025de8ba5e3418b7477d8a2':
| | * \ \ \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-070-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
* | | \ \ \ \ \ am 01383571: am 07bebe8b: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0138357198244b5bda242e248ed98040622ea5af': Don't use SNR in the invalid check.
| * | | | | | | am 07bebe8b: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-070-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07bebe8b12555ea0fb57729e8ee2e7efc343e7e2': Don't use SNR in the invalid check.
| | * \ \ \ \ \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-070-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
| | | * | | | | | Don't use SNR in the invalid check.John Wang2012-02-061-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since some RILs use -1 instead of INVALID_SNR as invalid vlue for LTE SNR, SignalStrength will not use LTE SNR to check if LTE valid. bug:5970403 Change-Id: Ia948e076f8f5878e081e87680076b187857879c8
* | | | | | | | | Merge "Make media scanner use new delete-parameter"Marco Nelissen2012-02-072-10/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make media scanner use new delete-parameterMarco Nelissen2012-02-072-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This speeds up the media scan case where many files were deleted or moved. Change-Id: I86e6fc6d0968eebf24923c0b5587b90d309721bb
* | | | | | | | | | Comment out a warning message to avoid log spamming.Chih-Chung Chang2012-02-071-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The warning message happens a lot when the region decoder is used (like viewing a picture in the Gallery app). Change-Id: I435f92eac8f322b091f3ed14ee48d0b5f0d84a8a
* | | | | | | | | | Merge "make sure to ignore SIGPIPE in the write side of BitTube"Mathias Agopian2012-02-061-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | make sure to ignore SIGPIPE in the write side of BitTubeMathias Agopian2012-02-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If4f037f4403d3ecbcd5f91248354765fc0fa13cb
* | | | | | | | | | | Merge "Fix a setBackgroundDrawable in layoutlib."Xavier Ducrohet2012-02-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix a setBackgroundDrawable in layoutlib.Xavier Ducrohet2012-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5f3ec8cc6863fa5929743ef4014c331633efce9
* | | | | | | | | | | | Merge "Fix bug #5968466 system running out of memory during WebView ↵Fabrice Di Meglio2012-02-061-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | performance test"
| * | | | | | | | | | | | Fix bug #5968466 system running out of memory during WebView performance testFabrice Di Meglio2012-02-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - there can be only one Arabic "normal" fallback Change-Id: I07f8123be0988bbb5b2fb23cc3fbf13870ef36c0
* | | | | | | | | | | | | Merge "Update BiDiTest app for adding GridLayout unit tests"Fabrice Di Meglio2012-02-067-0/+322
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update BiDiTest app for adding GridLayout unit testsFabrice Di Meglio2012-02-067-0/+322
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added basic GridLayout unit tests for LTR / RTL / Locale cases Change-Id: Ied9814b2f56acb5d3666e78ad600f487ce4dc911
* | | | | | | | | | | | | am a0da8adf: am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid ↵John Wang2012-02-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check." into ics-mr1 * commit 'a0da8adf5519d0660d6f0f44e7f91b99d6b741d9':
| * | | | | | | | | | | | am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ↵John Wang2012-02-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '397d3ffcbd27d10b9479e58a46ca6ba70838b697':
| | * | | | | | | | | | | am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1John Wang2012-02-061-3/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123': Don't use SNR in the invalid check.
* | | \ \ \ \ \ \ \ \ \ \ \ am 7e6295b3: am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid ↵John Wang2012-02-061-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check." into ics-mr1 * commit '7e6295b32310afddccf5fb030d4c475ed3678e0f': Don't use SNR in the invalid check.
| * | | | | | | | | | | | | am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ↵John Wang2012-02-061-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '9ad528d51c6e7b56e018100897b3c1cd6f9a2c17': Don't use SNR in the invalid check.
| | * | | | | | | | | | | | am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1John Wang2012-02-061-3/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123': Don't use SNR in the invalid check.
| | | * | | | | | | | | | | Merge "Don't use SNR in the invalid check." into ics-mr1John Wang2012-02-061-3/+2
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Don't use SNR in the invalid check.John Wang2012-02-061-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since some RILs use -1 instead of INVALID_SNR as invalid vlue for LTE SNR, SignalStrength will not use LTE SNR to check if LTE valid. bug:5970403 Change-Id: Ia948e076f8f5878e081e87680076b187857879c8
* | | | | | | | | | | | | | | Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into ↵Craig Mautner2012-02-063-999/+1127
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiple methods."
| * | | | | | | | | | | | | | | Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple ↵Craig Mautner2012-02-063-999/+1127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods. Change-Id: I80152c38741ce73b92da9483cfed84efbac34f89
* | | | | | | | | | | | | | | | Merge "CrespoMMS appears after delay in the thread"Tom Taylor2012-02-062-53/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | CrespoMMS appears after delay in the threadTom Taylor2012-02-062-53/+142
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5032682 Part A of several parts to speed up sending MMS's. In this change, don't allow multiple threads to write out the same pdu at the same time. This was causing problems between the thread sending the mms message and the UI trying to refresh and display the in-progress-sending message. Change-Id: I862081619e6b6808caaba86a3b48820e0ef75aba
* | | | | | | | | | | | | | | | am 82a74bbe: (-s ours) am 82fc005f: am 331bb0c3: Setup ActionBars in ↵Xavier Ducrohet2012-02-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib the same way the platform does it. do not merge. * commit '82a74bbe91b7e90ec2fca56650e3d55ebdedeac2':
| * | | | | | | | | | | | | | | am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the ↵Xavier Ducrohet2012-02-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platform does it. do not merge. * commit '82fc005f579a20b3c7e63603f056ca095c288196':
| | * | | | | | | | | | | | | | am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does ↵Xavier Ducrohet2012-02-064-21/+57
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it. do not merge. * commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2': Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* | | | | | | | | | | | | | | | am c9bcd33a: (-s ours) am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars ↵Xavier Ducrohet2012-02-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in layoutlib the same way the platform does it. do not merge. * commit 'c9bcd33afa5c34e0a49955c30aa875ac8205b65f': Setup ActionBars in layoutlib the same way the platform does it. do not merge.
| * | | | | | | | | | | | | | am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same ↵Xavier Ducrohet2012-02-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | way the platform does it. do not merge. * commit 'b1f95c6a938f6eaaa7a3fd28574a14647178059b': Setup ActionBars in layoutlib the same way the platform does it. do not merge.
| | * | | | | | | | | | | | | am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does ↵Xavier Ducrohet2012-02-064-21/+57
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it. do not merge. * commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2': Setup ActionBars in layoutlib the same way the platform does it. do not merge.
| | | * | | | | | | | | | | | Setup ActionBars in layoutlib the same way the platform does it. do not merge.Xavier Ducrohet2012-02-064-21/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a simple ImageView for the icon, this uses the platform layout/action_bar_home which uses a custom class to position and resize the icon (and also supports the Up icon that we don't yet support). This ensures that the icon is properly positionned and sized like on devices. (cherry picked from commit 7396348dfcfb45b7ad055f4c18cabbe5e8270d26) Change-Id: Ifd3bc318089b70ba843519523e366e59d434e919
* | | | | | | | | | | | | | | Merge "Don't call virtual function in destructor of SurfaceMediaSource"James Dong2012-02-062-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Don't call virtual function in destructor of SurfaceMediaSourceJames Dong2012-02-062-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3cbc2b1222335b61c814b5cdcfaefa495148b0ec