summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 414cc6cf: am 9af875ec: am 5e095939: docs: update menu guide with CAB and ↵Scott Main2012-02-016-337/+699
|\ | | | | | | | | | | | | popup menu, plus many other revisions * commit '414cc6cfcdb6d766d095f0af1da76e7da946af84': docs: update menu guide with CAB and popup menu, plus many other revisions
| * am 9af875ec: am 5e095939: docs: update menu guide with CAB and popup menu, ↵Scott Main2012-02-016-337/+699
| |\ | | | | | | | | | | | | | | | | | | plus many other revisions * commit '9af875ec74e34541539897d7a8069b4ea7f07b12': docs: update menu guide with CAB and popup menu, plus many other revisions
| | * am 5e095939: docs: update menu guide with CAB and popup menu, plus many ↵Scott Main2012-02-016-337/+699
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | other revisions * commit '5e0959393426371dadef2c7905d5c915a1ac2dd4': docs: update menu guide with CAB and popup menu, plus many other revisions
| | | * docs: update menu guide with CAB and popup menu, plus many other revisionsScott Main2012-02-016-337/+699
| | | | | | | | | | | | | | | | Change-Id: I5faedd5f5b812ca58eb2085b0c036570de861f15
* | | | Merge "The software AMR NB encoder is now an OMX component."Andreas Huber2012-02-016-5/+510
|\ \ \ \
| * | | | The software AMR NB encoder is now an OMX component.Andreas Huber2012-02-016-5/+510
| | | | | | | | | | | | | | | | | | | | Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
* | | | | Merge "Use PackageManager to detect wifi-only devices in ↵Xia Wang2012-02-015-47/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ConnectivityManagerTest."
| * | | | | Use PackageManager to detect wifi-only devices in ConnectivityManagerTest.Brett Chabot2012-02-015-47/+59
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9749bf9024a73af095d4a681bb902594828ad599
* | | | | | am 606b16bc: am e546b879: am ccc11c4d: Merge "Fix a typo in image processing ↵Xia Wang2012-02-011-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | test" into ics-mr1 * commit '606b16bc160e66709408b3e49e273efcff0a148d': Fix a typo in image processing test
| * | | | | am e546b879: am ccc11c4d: Merge "Fix a typo in image processing test" into ↵Xia Wang2012-02-011-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'e546b879a5aa9c58a58fc1c5a2e3eb0123d4d5b2': Fix a typo in image processing test
| | * | | | am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1Xia Wang2012-02-011-1/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit 'ccc11c4d3c8357a402b84c546e7b2f889729358c': Fix a typo in image processing test
| | | * | | Merge "Fix a typo in image processing test" into ics-mr1Xia Wang2012-02-011-1/+1
| | | |\ \ \
| | | | * | | Fix a typo in image processing testXia Wang2012-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c39a144dc7c724188e6ebad76c51c3ac1e818e1
* | | | | | | Merge "Fix 3 broken unittests."Makoto Onuki2012-02-011-12/+12
|\ \ \ \ \ \ \
| * | | | | | | Fix 3 broken unittests.Shaopeng Jia2012-02-011-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ebf1dc988f74d961dead376599fd7ebca5883bd
* | | | | | | | Merge "Update preload drawables to not include pre-holo assets."Dianne Hackborn2012-02-011-109/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Update preload drawables to not include pre-holo assets.Dianne Hackborn2012-01-311-109/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id73bcb67961aef8b84e2664dd9edf39208ab6fa5
* | | | | | | | | am 964faa35: am 3f3afbef: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | * commit '964faa351815a86cf6832f261e71daf48af3d5c6':
| * | | | | | | | am 3f3afbef: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | * commit '3f3afbef0fc7c4199bb7d992dc52efaa6db1b91a':
| | * | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | Change-Id: I79900da9bc339bad1350124768b53026f465a345
* | | | | | | | | am 5ec5c752: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | * commit '5ec5c7525d3144c306ad245dd10d893ecdf654fa': Use LTE SNR and RSRP to set signal level bar.
| * | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | Change-Id: Ia38fac8a91adbce6ae5c796c86252ac2364e3a6f
| | * | | | | | Use LTE SNR and RSRP to set signal level bar.John Wang2012-01-313-16/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LTE signal strength level is the smaller one between lte rsrp level and lte snr level if both rsrp and snr are valid. The lte snr mapping are Four bars: SNR >= 45 Three bars: 10 <= SNR < 45 Two bars: -30 <= SNR < 10 One bars: SNR < -30 No bars: No Service The invalid value of lte snr is changed to INVALID_SNR from -1, since -1 is a valid value of lte snr. bug:5640958 Change-Id: If26aaba0c7fcc0fee3db488b5adfa02922f06715
| | * | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-310-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-300-0/+0
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | am 1a8a8b73: am 0b2701b7: Merge "docs: change that stated as a few doc fixes ↵Scott Main2012-02-013-68/+139
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag c * commit '1a8a8b73d48261384a0f63df894b68db97e7b02c': docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug.
| * | | | | | | am 0b2701b7: Merge "docs: change that stated as a few doc fixes and turned ↵Scott Main2012-01-313-68/+139
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a form * commit '0b2701b7344fb7b7b6f9a1c1c99c8ede81b49d2d': docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug.
| | * | | | | | Merge "docs: change that stated as a few doc fixes and turned into fully ↵Scott Main2012-01-313-68/+139
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug." into ics-mr1
| | | * | | | | | docs: change that stated as a few doc fixes and turned intoScott Main2012-01-313-68/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug. Change-Id: Ia4b33559bd5ad2cbae8b53966999cf7f5038b125
* | | | | | | | | Merge "Add tools specific annotations to the API."Xavier Ducrohet2012-01-313-0/+83
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add tools specific annotations to the API.Xavier Ducrohet2012-01-313-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those annotations are not runtime retention and have zero impact on the device builds. Change-Id: I18d905fccfe18eb621e1411d7ae7ba97910cc727
* | | | | | | | | | Merge "add tests module tag to omx_tests"James Dong2012-01-311-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add tests module tag to omx_testsJames Dong2012-01-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5dcb5187f09a7ae980ac5857b7ade81001d459f8
* | | | | | | | | | | Merge "Clear identity when updating network stats."Jeff Sharkey2012-01-311-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Clear identity when updating network stats.Jeff Sharkey2012-01-311-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5945461 Change-Id: Ie51ea3f107a705c395b65684f21bf4c28c7f4d33
* | | | | | | | | | | Merge "fix an issue with vsync event delivery"Mathias Agopian2012-01-313-8/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix an issue with vsync event deliveryMathias Agopian2012-01-313-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vsync events were sometimes delivered to connected client who didn't request them. this happened if another client requested the delivery and that client was first in the client list. also fix the vsync test which didn't request any events as well as DisplayEventReveiver documentation which was misleading about the necessity to request vsync events. Change-Id: Ie990fda3f337f8f0042745c4b2cde67936c45686
* | | | | | | | | | | | Merge "Nexus S now reports the proper frame-rate"Mathias Agopian2012-01-311-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Nexus S now reports the proper frame-rateMathias Agopian2012-01-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't hardcode it. Change-Id: I4b37f37a9809cac937e6334c988b3185af2ebe22
* | | | | | | | | | | | aapt now sorts the strings in the resource string pool.Dianne Hackborn2012-01-3111-896/+1359
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In our current environment with very many translations, this can save a lot of RAM -- for example over 200K in Gmail just by sorting the strings in the Gmail .apk (not the framework). Also add a new aapt command to print the contents of the resource table string pool. Change-Id: I1da037b3e2c377b890833ff57ab158965314ac48
* | | | | | | | | | | | Merge "Test RS struct writing/reading."Stephen Hines2012-01-313-0/+93
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Test RS struct writing/reading.Stephen Hines2012-01-313-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=5569561 Note that this only tests the issue described in the bug. It does not actually produce an error on any recent version of RS. Change-Id: I0194b13cb3f4ff01ce95d966e8e2dd74119a3946
* | | | | | | | | | | | Merge "Dump xt_qtaguid stats to using GID instead of su."Jeff Sharkey2012-01-311-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Dump xt_qtaguid stats to using GID instead of su.Jeff Sharkey2012-01-311-2/+2
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77a956cf37c1f1f792f6939b2f32a47f1cbe14c0
* | | | | | | | | | | | am 66146c4f: am 792d83c5: Merge "Use LTE SNR and RSRP to set signal level ↵Justin Ho2012-01-313-16/+48
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bar." into ics-mr1 * commit '66146c4f5b3930f7f5f08b845fb30f2bc24f8c3d': Use LTE SNR and RSRP to set signal level bar.
| * | | | | | | | | | | am 792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1Justin Ho2012-01-313-16/+48
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '792d83c5087a7a6dec4e64f59f5b78d1041c9585': Use LTE SNR and RSRP to set signal level bar.
| | * | | | | | | | | | Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1Justin Ho2012-01-313-16/+48
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Use LTE SNR and RSRP to set signal level bar.John Wang2012-01-313-16/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LTE signal strength level is the smaller one between lte rsrp level and lte snr level if both rsrp and snr are valid. The lte snr mapping are Four bars: SNR >= 45 Three bars: 10 <= SNR < 45 Two bars: -30 <= SNR < 10 One bars: SNR < -30 No bars: No Service The invalid value of lte snr is changed to INVALID_SNR from -1, since -1 is a valid value of lte snr. bug:5640958 Change-Id: If26aaba0c7fcc0fee3db488b5adfa02922f06715
* | | | | | | | | | | | Merge "Support select all"John Reck2012-01-312-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Support select allJohn Reck2012-01-312-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external/webkit CL: 161648 Change-Id: I9cdff2e2e9a1e986ef10946924da85c7b577352b