summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Pass Bitmap instead of ParcelFileDescriptor in UserManagerAmith Yamasani2012-09-174-27/+47
| | | | | | | | Add a USER_INFO_CHANGED intent for lockscreen and quicksettings to use to monitor changes to the user name or icon. Bug: 7164040 Change-Id: Id6fb8b6d38ce04ccd02bbadcf0c10699783d6c03
* Merge "Revert "Simple MVC based binding mechanism for android controls." Do ↵Philip Milne2012-09-177-365/+7
|\ | | | | | | not merge." into jb-mr1-dev
| * Revert "Simple MVC based binding mechanism for android controls." Do not merge.Philip Milne2012-09-177-365/+7
| | | | | | | | | | | | This reverts commit 989709a973448980f36dacd587b0a58f89ffa11e. Change-Id: Ifc2c511b0d99d4a3a164b4a2281ca140015b366d
* | Merge "Use shared app gid for dalvik cache" into jb-mr1-devKenny Root2012-09-171-2/+2
|\ \
| * | Use shared app gid for dalvik cacheKenny Root2012-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | For forward-locked apps, we need to be able to read the optimized dex file from a common place. Make it owned by the shared app GID as well. Bug: 7178231 Change-Id: Ib36d79e8df69d58e8e1e0f167659df995dc84b84
* | | Merge "Avert crash when dragging text in same TextView" into jb-mr1-devVictoria Lease2012-09-171-7/+7
|\ \ \
| * | | Avert crash when dragging text in same TextViewVictoria Lease2012-09-101-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation made liberal assumptions about the size of the string being edited, as well as the position of the substring being dragged. Explicitly checking those assumptions fixes our IndexOutOfBoundsException. Bug: 7129392 Change-Id: I32560cf87fbbe703a8b26c7eb2a64c8f8c0bfcf1
* | | | Merge "Making QS scrollable and making numerous tweaks." into jb-mr1-devWinson Chung2012-09-17224-31/+193
|\ \ \ \
| * | | | Making QS scrollable and making numerous tweaks.Winson Chung2012-09-17224-31/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updating new assets (all line up) - Updating brightness tile to reflect auto state - Fixing network tile asset colors - Adding press feedback Change-Id: I857f141258eefec65243454cb69905cbd2a10bf6
* | | | | Merge "Start userId from 10, reserving 1-9 for special use in the future." ↵Amith Yamasani2012-09-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | Start userId from 10, reserving 1-9 for special use in the future.Amith Yamasani2012-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d0c1717d8b3add75ba43ed98e53ba02e6682c34
* | | | | | Merge "Fix date formatting for fa locales." into jb-mr1-devElliott Hughes2012-09-172-25/+39
|\ \ \ \ \ \
| * | | | | | Fix date formatting for fa locales.Elliott Hughes2012-09-172-25/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for standalone months (L versus M) and localized digits. Bug: 6811327 Change-Id: I4687a4c67605c31b155c0b8d44b3da6ed378fc82
* | | | | | | Merge "Enabling hardware layers while overscrolling widget pager" into ↵Adam Cohen2012-09-173-2/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | Enabling hardware layers while overscrolling widget pagerAdam Cohen2012-09-173-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I94bef1aa614f91b115105adbb409def8027f3651
* | | | | | | | Merge "TaskStackBuilder - use the correct package for looking up parents" ↵Adam Powell2012-09-171-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | | TaskStackBuilder - use the correct package for looking up parentsAdam Powell2012-09-171-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 7179104 Change-Id: Ia5d2d285cf22e97c452e0c385ef38c8bce330491
* | | | | | | Merge "Swap remote submix initialization order." into jb-mr1-devJeff Brown2012-09-171-6/+15
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Swap remote submix initialization order.Jeff Brown2012-09-171-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to turn the submix on before connecting and off after disconnecting. Change-Id: I53389c3b61e6d663855accd0461eed42a67d9d2b
* | | | | | | Merge "Fix issue where recents would not show up sometimes" into jb-mr1-devMichael Jurka2012-09-171-2/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix issue where recents would not show up sometimesMichael Jurka2012-09-171-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea78f447b71ae23630c76c8982e69c780eef9df6
* | | | | | | | Merge "Fix occasional crash bug with layers" into jb-mr1-devChet Haase2012-09-1716-57/+119
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix occasional crash bug with layersChet Haase2012-09-1716-57/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Launcher occasionally crashes with a stack trace indicating that the memory of a Layer object is corrupt. It is possible for us to delete a Layer structure and then, briefly, use it to draw a DisplayList again before that DisplayList gets recreated (without the layer that got deleted). When this happens, if the memory got corrupted, it's possible to crash. The fix is to add Layer to the other objects which we currently refcount (bitmaps, shaders, etc.). Then instead of deleting a Layer, we decrement the refcount. We increment when creating it, then increment it again when it's referenced from a DisplayList. Then we decrement the refcount instead of deleting it, and decrement when we clear a DisplayList that refers to it. Then when the refcount reaches 0, we delete it. Issue #6994632 Native crash in launcher when trying to launch all apps screen Change-Id: I0627be8d49bb2f9ba8d158a84b764bb4e7df934c
* | | | | | | | Merge "Fix modulation and gamma correction issues" into jb-mr1-devRomain Guy2012-09-172-39/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix modulation and gamma correction issuesRomain Guy2012-09-142-39/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modulation is normally enabled in a shader when drawing with an alpha mask (A8 texture.) Modulation is used to do one of two things: - Colorize the primitive (to draw text in red for instance) - Apply extra translucency (50% translucent circle filled with a bitmap) The current implementation has four issues: 1. Unnecessary work is performed by assigning the modulation color to vec4 fragColor early in the shader 2. The modulation color's alpha is applied twice when the primitive is drawn with an SkShader 3. The decision to modulate is wrong and triggers when any of the RGB channels is < 1.0. Only the alpha channel needs to be taken into account to make the decision 4. Gamma correction is not applied properly This change addresses all four issues above. Change-Id: I73fcc74efc4b094bf2d1b835f10ffaa2ea4b9eb9
* | | | | | | | | Merge "Add UserManager.getUserIcon()" into jb-mr1-devAmith Yamasani2012-09-173-4/+34
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Add UserManager.getUserIcon()Amith Yamasani2012-09-173-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we don't abuse the setUserIcon() for reading. So the new method won't try to create the file, only return it if it exists. Change-Id: I7a81d3f1b29d14d37e71f531744ce39f21d827ac
* | | | | | | | | am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols ↵Xavier Ducrohet2012-09-173-14/+205
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option to aapt." * commit '79c95c3b50ff332f9c92430fd10a15eb648a0b02': Add --output-text-symbols option to aapt.
| * \ \ \ \ \ \ \ \ am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt."Xavier Ducrohet2012-09-173-14/+205
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5de9603529ee01a416b5fa31074197565fde4482': Add --output-text-symbols option to aapt.
| | * \ \ \ \ \ \ \ \ am 31820a35: Merge "Add --output-text-symbols option to aapt."Xavier Ducrohet2012-09-173-14/+205
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d': Add --output-text-symbols option to aapt.
| | | * \ \ \ \ \ \ \ \ Merge "Add --output-text-symbols option to aapt."Xavier Ducrohet2012-09-173-14/+205
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Add --output-text-symbols option to aapt.Xavier Ducrohet2012-09-113-14/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Library projects in the SDK are built using --non-constant-id to generate a temporary R.java class. When the library is packaged with the application to generate an apk, the R class is recreated with the proper IDs due to all the resources coming from the app and all the libraries. However for large apps with many libraries (each with their own R class in their package), this means a lot of unnecessary IDs: all R classes contains all the IDs including for resources from by projects they don't have access through the dependency graph. For really large apps (X,000 resources), with lots of libraries (10+), this can generate tens of thousands of resources, which can trigger dalvik's limit of 65K fields and methods per dex files. This changes lets aapt generate not only the R class but a simple text file containing the list of all those IDs so that it is easier to parse back. The SDK build system will not ask aapt to generate the R class of the libraries (through the --extra-packages option), instead it will then read this file to know what IDs are needed for each library and generate a much smaller R class for each library (using the same text file output from compiling all the resources to get the final integer value). Change-Id: I4db959fec372cf3ead9950e4b2b82fa1ae7eed2d
* | | | | | | | | | | | | am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert ↵Xavier Ducrohet2012-09-173-19/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option to aapt." * commit '8a67598eb780560b7efe4e1d9944c7cbcf83bbb1': Add --error-on-failed-insert option to aapt.
| * | | | | | | | | | | | am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt."Xavier Ducrohet2012-09-173-19/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc9747ed45302956a3ec9dd21f7b950b837dbfdd': Add --error-on-failed-insert option to aapt.
| | * | | | | | | | | | | am d7252571: Merge "Add --error-on-failed-insert option to aapt."Xavier Ducrohet2012-09-173-19/+60
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b': Add --error-on-failed-insert option to aapt.
| | | * | | | | | | | | | Merge "Add --error-on-failed-insert option to aapt."Xavier Ducrohet2012-09-173-19/+60
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | Add --error-on-failed-insert option to aapt.Xavier Ducrohet2012-09-113-19/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new SDK build system give the ability to insert versionCode/Name and min/targetSdkVersion in the manifest but aapt won't replace those if they already exist. The main problem is that aapt doesn't actually fail when it doesn't replace them, making the output not what the developer wanted. This patch set adds an option to aapt to make it return an error if the insert failed because the attribute already existed. Change-Id: I8938ec1238da407a8562c974e9598db39001ffd9
* | | | | | | | | | | | | Add debug to help with b/7135184.Craig Mautner2012-09-172-16/+29
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d3b60b3e123d35bd557d47e3344ebea1964380b Conflicts: services/java/com/android/server/wm/WindowAnimator.java
* | | | | | | | | | | | Merge "Change order of ps and suspendmode calls" into jb-mr1-devIrfan Sheriff2012-09-171-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Change order of ps and suspendmode callsIrfan Sheriff2012-09-171-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7872dbea7dc30c57960af95e86eb8e4c7f8e92dc
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-1749-767/+2288
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-1449-767/+2288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb01887900c080dcc8d7942e97fd3cc9e871d34a Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-1749-1736/+987
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-1449-1736/+987
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie3512f874a89b0d99d4533a9d0620aaa5b85b555 Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "PhoneStatusBar: Fix NPE while accessing quick settings." into jb-mr1-devSiva Velusamy2012-09-171-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | PhoneStatusBar: Fix NPE while accessing quick settings.Siva Velusamy2012-09-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Bug 7137026 Change-Id: Id156cf8ebb1a31202015a167185a6588283128f8
* | | | | | | | | | | | | Merge "Camera: Document face detection confidence recommendations." into ↵Eino-Ville Talvala2012-09-171-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | | | | | | | Camera: Document face detection confidence recommendations.Eino-Ville Talvala2012-09-151-2/+8
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7108023 Change-Id: I9de583254d127f9c1f702b7ed159a7080bcbfd25
* | | | | | | | | | | | | Merge "headphone volume limitation" into jb-mr1-devEric Laurent2012-09-175-1/+239
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | headphone volume limitationEric Laurent2012-09-165-1/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit music volume when headphones or headset are inserted. Display warning message when user wants to increase the volume above a platform specific volume and request user acknowledgement before proceeding. TODO: exact wording of the warning message must be defined by UX. Change-Id: I00f429f602534c6d8783126b929371c4d432e6e2
generated by cgit v1.1 at 2025-01-13 17:19:19 +0000