summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Bring up the ethernet interface when detected" into jb-devRobert Greenwalt2012-05-071-5/+14
|\
| * Bring up the ethernet interface when detectedRobert Greenwalt2012-05-071-5/+14
| | | | | | | | | | | | | | | | We don't get link status info if it's down. If the device has been configured for ethernet and we see the interface appear, we should make it active. bug:6444395 Change-Id: Ibc233ab12942b069d7db9c0671936798c5161659
* | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-0749-0/+196
|\ \
| * | Import translations. DO NOT MERGEEric Fischer2012-05-0749-0/+196
| | | | | | | | | | | | Change-Id: Icee68860c27c90d2ef41c0e29660fcda35ec658d
* | | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-0749-2645/+2068
|\ \ \
| * | | Import translations. DO NOT MERGEEric Fischer2012-05-0749-2645/+2068
| |/ / | | | | | | | | | Change-Id: Id186acbe0e1b24f840ca3fdeb73c94d0c3d2aaa6
* | | Merge "Fix issue where scale-animating text would jump temporarily a few ↵Chet Haase2012-05-072-8/+5
|\ \ \ | | | | | | | | | | | | pixels" into jb-dev
| * | | Fix issue where scale-animating text would jump temporarily a few pixelsChet Haase2012-05-072-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some logic in the native matrix code would determine that a matrix was 'pureTranslate' based on the scale values of a matrix being close-enough to 1, which was within a very small epsilon. This works in general, because screen space coordinates make that epsilon value irrelevant, so close-enough really is close-enough. However, TextView, when centering text, works in a coordinate system that is quite huge, with left/right values about 500,000. These numbers multiplied times that small epsilon value would give a result that was significant, and would cause a miscalculation of up to 4-5 pixels, causing the snap that we'd see for a couple of frames as the scale got "close enough" to 1. The fix is to remove the optimization of "close enough". What we really need the matrix to do is to identify itself as being translate-only when no scale as been set (which is the default). For the purposes of that check, it is good enough to simply check the values against 1 directly. Similarly, the bounds-check logic needs to check against 0 and 1 directly. Issue #6452687: Glitch when changing scale of a view containing text Change-Id: I167fb45d02201fb879deea0e5a7ca95e38128e17
* | | | Merge "Change DimAnimator to reflect rotations." into jb-devCraig Mautner2012-05-072-3/+12
|\ \ \ \
| * | | | Change DimAnimator to reflect rotations.Craig Mautner2012-05-072-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enlarge DimAnimator to cover corners when frozen surface rotates. Update DimAnimator size following rotation to reflect new dimensions. Fixes bug 6449788. Fixes bug 6449035. Change-Id: I217d7c96af940e6affc395b79dc665d00318b18c
* | | | | Merge "Fix crash when decoding bitmap" into jb-devMarco Nelissen2012-05-071-0/+3
|\ \ \ \ \
| * | | | | Fix crash when decoding bitmapMarco Nelissen2012-05-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externally reported crash when decoding corrupted .wmf file. b/5048623 Change-Id: I1df0861cd36983cb4d1460caa221c54d3fc240af
* | | | | | Hide optical bounds feature for JB.Philip Milne2012-05-072-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1fe38e9c64515acd550baa930ebc0af4c139bf40
* | | | | | Merge "Javadoc improvements in SearchView per API review." into jb-devAmith Yamasani2012-05-071-0/+4
|\ \ \ \ \ \
| * | | | | | Javadoc improvements in SearchView per API review.Amith Yamasani2012-05-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6442174 Added attr refs to 2 methods. Change-Id: I9b5f93e8e921a7260fdc25c8134e655f09a1ffb7
* | | | | | | Merge "Remove heldMotionless disabling native scroll mode" into jb-devJohn Reck2012-05-071-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove heldMotionless disabling native scroll modeJohn Reck2012-05-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6448030 Change-Id: I9c673208eb2302ea772931e15266e02cb0129ce5
* | | | | | | | Merge "Final fix in SpannableStringBuilder." into jb-devGilles Debunne2012-05-071-8/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Final fix in SpannableStringBuilder.Gilles Debunne2012-05-041-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6448052 The empty EXCLUSIVE removal condition was incorrect. Also changed the unit test the didn't catch this problem. Change-Id: I5576d830cdfa6cc3716c878fb698695a2978b296
* | | | | | | | | Merge "Ack, wrap advisePersistThreshold() in lock." into jb-devJeff Sharkey2012-05-071-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ack, wrap advisePersistThreshold() in lock.Jeff Sharkey2012-05-071-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6449725 Change-Id: I702dc2ff9d4b237c46d89bcae41289bc3e9ef2f8
* | | | | | | | | | Merge "Use private key context when necessary" into jb-devSelim Gurun2012-05-073-21/+66
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use private key context when necessarySelim Gurun2012-05-043-21/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6249185 Due to recent changes to keystore, we cannot rely on encoded key format anymore. Rather we receive the key context (a pointer to private key really) and pass it to native openssl. We also keep the original logic however. Change-Id: Iefe9f0336dd5f47eec4222fcb6fec58807e7cac0
* | | | | | | | | | | Merge "Use callable-filter capability when updating call log" into jb-devDaisuke Miyakawa2012-05-071-3/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use callable-filter capability when updating call logDaisuke Miyakawa2012-05-061-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CallerInfo#phoneNumber has a formatted phone number even when contacts database itself has an unformatted one, so just using Phone.CONTENT_URI may not be enough to find the relevant contact. Bug: 6291905 Change-Id: Ie6e40529eb1f9cf98de861601669dbccb718541c
* | | | | | | | | | | | Merge "Log more frame data when profiling GL apps" into jb-devRomain Guy2012-05-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Log more frame data when profiling GL appsRomain Guy2012-05-071-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib7377c22a2258aa6510677d80df34bb7e73dc714
* | | | | | | | | | | | Merge "Drain any pending touch events immediately if possible" into jb-devJohn Reck2012-05-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | / / / / / / | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Drain any pending touch events immediately if possibleJohn Reck2012-05-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6317798 Change-Id: Id343801cf80817f587414224cc67c13d34efed04
* | | | | | | | | | | Merge "Restore do-not-disturb mode on tablets." into jb-devDaniel Sandler2012-05-072-0/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Restore do-not-disturb mode on tablets.Daniel Sandler2012-05-042-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6195112 Change-Id: Iecb850942df43fb8861cbbf2e2343c2aabfc4263
* | | | | | | | | | | | Merge "Close notification blame popups when the panel disappears." into jb-devDaniel Sandler2012-05-074-6/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Close notification blame popups when the panel disappears.Daniel Sandler2012-05-044-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also be sure to cancel the longpress listeners when things change. Finally, increase the longpress timeout to 1.5x normal longpress. Bug: 6441520 Change-Id: Icea4d2a5c98a9a51a15f0762454de9e5cd454c50
* | | | | | | | | | | | Merge "Add number back to legacy notifications." into jb-devDaniel Sandler2012-05-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Add number back to legacy notifications.Daniel Sandler2012-05-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5816717 Change-Id: I52c98143378c315dec5b525cb3d96c214ee8196e
* | | | | | | | | | | | Spell check the first word of the sentencesatok2012-05-071-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7803d92de8f4ea399cef5c2d1ddf5396d59ef2cf
* | | | | | | | | | | | Merge "DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the ↵satok2012-05-071-34/+110
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spell check doesn't start when the user changes the cursor position by touch" into jb-dev
| * | | | | | | | | | | | DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the spell ↵satok2012-05-071-34/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check doesn't start when the user changes the cursor position by touch Change-Id: I1535eae23efc42660b9d1e6dbfba6c800b0302b2
* | | | | | | | | | | | | Merge "Better screen size adaptation for ResolverActivity" into jb-devAdam Powell2012-05-066-7/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Better screen size adaptation for ResolverActivityAdam Powell2012-05-066-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c982c0b7c722ca7cad46cc23ac8d161bee3a1ff
* | | | | | | | | | | | | Merge "Increase the Message pool size" into jb-devRomain Guy2012-05-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Increase the Message pool sizeRomain Guy2012-05-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If609c9ffbea800ff6409b0096a82f0b899f29343
* | | | | | | | | | | | | Merge "Limit item heights in split action bars" into jb-devAdam Powell2012-05-062-8/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Limit item heights in split action barsAdam Powell2012-05-062-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6449422 Overzealous action views should not be able to cause action bars to take up a huge amount of space. Fixed text alignment on action buttons Change-Id: Ic28d6dacdb6933c63b323f5ed6a6cab5d3726938
* | | | | | | | | | | | | | Merge "Fix typo." into jb-devDianne Hackborn2012-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix typo.Dianne Hackborn2012-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29a270c7499a96718b3d2cad8c2b89783a5607f8
* | | | | | | | | | | | | | Merge "Revisions to ResolverActivity" into jb-devAdam Powell2012-05-065-74/+235
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revisions to ResolverActivityAdam Powell2012-05-065-74/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6428812 Change ResolverActivity to use a grid rather than a list, and present buttons for "Use Always" and "Just Once". Use large launcher icons when appropriate. Change-Id: I177360a727cbc4b401ffbcea83d1b3dac1de5744
* | | | | | | | | | | | | | | Merge "Finish up issue #6249094: Display permissions based on relevance to ↵Dianne Hackborn2012-05-0691-68/+157
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | private data" into jb-dev
| * | | | | | | | | | | | | | Finish up issue #6249094: Display permissions based on relevance to private dataDianne Hackborn2012-05-0691-68/+157
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added bitmaps for permission group icons. We had to pick either icons for a dark or light background, and it had to be light for settings, so the installer theme has gone back to dark. Tweaked the permission groups to match the icons. Redid the group priorities to make them correct (they were written with higher priorities being less important). Fixed bug where priority was not being used for system apps. Change-Id: Ia3d3f0c1614a11b4cfd11682ce9e6c9f87d75c06