summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryromJeff Sharkey2011-10-064-22/+4
|\ | | | | | | | | * commit 'a50d0f8985d811a6a2f49aa65e31892048e96ccf': Hide quota APIs until finalized.
| * Merge "Hide quota APIs until finalized." into ics-factoryromJeff Sharkey2011-10-064-22/+4
| |\
| | * Hide quota APIs until finalized.Jeff Sharkey2011-10-064-22/+4
| | | | | | | | | | | | | | | Bug: 5383656 Change-Id: Ia2a978a6ff2ee642b0ea4d7d6b8857b7efffd612
* | | Merge "docs: add new action item and state list drawable resource attributes"Scott Main2011-10-062-3/+27
|\ \ \
| * | | docs: add new action item and state list drawable resource attributesScott Main2011-10-052-3/+27
| | | | | | | | | | | | | | | | Change-Id: I68d514390b5369536be5251e23dbb298c5a0e7b0
* | | | am 2fc826ec: (-s ours) Import translations for late permission additions.Eric Fischer2011-10-060-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '2fc826ec944cf85d1c3e65011091c58dc94110c0': Import translations for late permission additions.
| * | | Import translations for late permission additions.Eric Fischer2011-10-0646-29/+217
| | |/ | |/| | | | | | | Change-Id: I80c968b0f6fd74cc52443a3729d02490c77aef30
* | | Merge "Set mGotCountryCode properly."Wink Saville2011-10-063-0/+3
|\ \ \
| * | | Set mGotCountryCode properly.Wink Saville2011-10-063-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mGotCountryCode needs to be set to false when we don't know the country code and to true only when we do. Bug: 2578334 Change-Id: I7cb21e627ae115880df5f9b2095cb4ba094ab751
* | | | Merge "Improve a warning message in WebViewCore's EventHub"Steve Block2011-10-061-13/+4
|\ \ \ \
| * | | | Improve a warning message in WebViewCore's EventHubSteve Block2011-10-061-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These warnings appear occasionally and this will help track them down. Also removes an unused method. Bug: 5421676 Change-Id: I5ba3f146449623e3457aafc91fd2e7edc367a9d9
* | | | | Merge "Pass correct units for text size in autocomplete drop down."Ben Murdoch2011-10-061-1/+1
|\ \ \ \ \
| * | | | | Pass correct units for text size in autocomplete drop down.Ben Murdoch2011-10-061-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to set the size of the text used in the autocomplete drop down in pixels, as we do when setting the size of the EditText itself. Bug: 5420125 Change-Id: Ife6d8c108c57106ffaa8706fa9e4e537a73a1733
* | | | | Merge "Prevent adapter flickering"John Reck2011-10-062-6/+10
|\ \ \ \ \
| * | | | | Prevent adapter flickeringJohn Reck2011-10-052-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5403763 Prevent rapidly switching between a null adapter and a valid adapter by only clearing if the node pointer changes or the text view is no longer autocompletable. Change-Id: Ie594396db807b5ad5e1a5a0e68ec0c7677364aaf
* | | | | | Merge "Mark random music player sample as updated in the resource TOC"Roman Nurik2011-10-061-2/+2
|\ \ \ \ \ \
| * | | | | | Mark random music player sample as updated in the resource TOCRoman Nurik2011-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26b387ff62d56a276bef10c3c943c3baf5646a39
* | | | | | | Merge "Return a runtime error instead of assertion if seeking beyond EOS in ↵Andreas Huber2011-10-061-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mpeg4 files."
| * | | | | | | Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 ↵Andreas Huber2011-10-061-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files. Change-Id: If6531b4a1ff45460cfcdcc04764c5c63a2f5a749 related-to-bug: 5418914
* | | | | | | | Merge "Fix SslError.getPrimaryError() to return -1 if the set of errors is ↵Steve Block2011-10-062-4/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | empty"
| * | | | | | | Fix SslError.getPrimaryError() to return -1 if the set of errors is emptySteve Block2011-10-052-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix a couple of buggy asserts. Bug: 5416594 Change-Id: I0e7e2548886af5fc0b8c20f70a3040d2c5bc68ea
* | | | | | | | Merge "primary progress updated to fix clipping problem"Justin Ho2011-10-066-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | primary progress updated to fix clipping problemRichard Ngo2011-10-056-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98aed6f5f2ca1de31802ca15ad16ae8143142538
* | | | | | | | | Merge "scrubber assets updated to larger size"Justin Ho2011-10-0612-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | scrubber assets updated to larger sizeRichard Ngo2011-10-0512-0/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id30d2591a177ca8f5eb5a21dd2880c8183945cd4
* | | | | | | | | Remove the mic from the keyboard in SearchViewLuca Zanolin2011-10-061-1/+12
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5357750 Change-Id: I20c87a25e95222772c6b5154d09dd681b966fd9a
* | | | | | | | Merge "Refine random stats generation."Jeff Sharkey2011-10-052-37/+94
|\ \ \ \ \ \ \ \
| * | | | | | | | Refine random stats generation.Jeff Sharkey2011-10-052-37/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Offer parameters to pick out specific list of packages, and to change duration and total data. Bug: 5416742 Change-Id: I6970a5e76f3198ef23a400c079037212b000ca6b
* | | | | | | | | Merge "Adding logging to debug widget deletions"Michael Jurka2011-10-051-43/+72
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Adding logging to debug widget deletionsAdam Cohen2011-10-051-43/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I15a943650f930fd3fb6163c60af85abc2865e684
* | | | | | | | | Merge "Fix build."Jeff Brown2011-10-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix build.Jeff Brown2011-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01dbb8747f81c83d86e089762b2d34d8bba2bffd
* | | | | | | | | | Merge "Fix 5396647: Move lock slider up by 10dip on lock screen."Jim Miller2011-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix 5396647: Move lock slider up by 10dip on lock screen.Jim Miller2011-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32d5b8bc784e2171b4880c08eeabfda7c58238db
* | | | | | | | | | | Merge "Add ActionBarCompat sample (CL 2 of 2)"Roman Nurik2011-10-054-4/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add ActionBarCompat sample (CL 2 of 2)Roman Nurik2011-10-054-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie64eaad0c5cd148288ee48c524ff3516522fc10f
* | | | | | | | | | | Merge "Fix build."Jeff Brown2011-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Fix build.Jeff Brown2011-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7bb00b8ee0da952f3697b23dccf32dde55733b7a
* | | | | | | | | | | Merge "Fix issue 5381089: problem with A2DP music volume"Eric Laurent2011-10-052-2/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix issue 5381089: problem with A2DP music volumeEric Laurent2011-10-052-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This problem only occurs when audio effects are present and the music volume is applied by one effect engine. When connecting or disconnecting A2DP, audio effects are moved from one mixer thread to another. When removed from the source thread, the effect is stopped but it is not restarted when added to the destination thread. This regression was introduced by commit 21b5c47e. Change-Id: I4cc578d8d760ec65b185032b6fda98c739d331bc
* | | | | | | | | | | | Merge "Make SENSOR orientation modes trump rotation lock. Bug: 5371750"Jeff Brown2011-10-054-13/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Make SENSOR orientation modes trump rotation lock.Jeff Brown2011-10-054-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5371750 Change-Id: I4d18b6c8ba1de0afd5929ddb8d7123272e35fbe2
* | | | | | | | | | | | Merge "updated blue border for stackviews to new holo blue"Richard Ngo2011-10-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | updated blue border for stackviews to new holo blueRichard Ngo2011-10-051-2/+2
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1dc52fa0b089e52afb2213b106aea049c861c1ea
* | | | | | | | | | | | Merge "Fixbug #5387832 [UI/Visual] Address of the website is not displayed ↵Fabrice Di Meglio2011-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly(second line of the address is partly shown)"
| * | | | | | | | | | | | Fixbug #5387832 [UI/Visual] Address of the website is not displayed ↵Fabrice Di Meglio2011-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly(second line of the address is partly shown) - make VERY_WIDE bigger ... 64 times actually Change-Id: I1a177ef5821d9341abb77ea69a50e05a5bfc97b5
* | | | | | | | | | | | | Merge "Add a time threshold for re-enabling networks"Irfan Sheriff2011-10-051-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add a time threshold for re-enabling networksIrfan Sheriff2011-10-051-1/+13
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconnecting to a bad network can be expensive (network down time wise and for the device as well). Add a minimum threshold. Bug: 5234206 Change-Id: I5ef1fe06038db73c29a3e95b6229506555f36c77
* | | | | | | | | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-10-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I656e0ea68c6bf350f391a3922884216955997686
| * | | | | | | | | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
generated by cgit v1.1 at 2025-01-12 19:13:28 +0000