summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* am ee973c27: Fix build.Dianne Hackborn2013-02-191-0/+6
|\ | | | | | | | | * commit 'ee973c27e339a23e0b93d816a97b33954af66bea': Fix build.
| * Fix build.Dianne Hackborn2013-02-191-0/+6
| | | | | | | | Change-Id: I277de38a70f3a2e5c1997a3fe5c2e825692ae9e1
* | am 7c93839d: Revert "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
|\ \ | |/ | | | | | | * commit '7c93839d7b41727c11925b034d4ec84491d3dee1': Revert "Tentative fix for aidl import issue"
| * Revert "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
| | | | | | | | | | | | | | | | Fix build. This reverts commit 4f115e08cb68aaf77693f3f4598f0eb5f7634777. Change-Id: Ic4f51e3492f54afec5f0eeb48e08491eb47f3c04
* | am 8acb27c5: Merge "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
|\ \ | |/ | | | | | | * commit '8acb27c505c610b4027ec3d140ccc7722ab4faa3': Tentative fix for aidl import issue
| * Merge "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
| |\
| | * Tentative fix for aidl import issueLaurent Tu2013-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue when aidl generation doesn't use the right type when it is a suffix of a pre-declared type. eg. android.location.Location and foo.android.location.Location. The aidl generation will never use foo.android.location.Location. The tentative fix reverses the order in which Namespace.Search iterates through the known types. A better fix would be to annotate the types that are declared in the aidl import statements to be prioritary in Namespace.Search. Lmk if I you agree with this approach and think that this is worth the work. Thanks! Change-Id: I97dd1a1d417075accf1d61f9aba5aba3dea175c6
* | | am 534d136a: Merge "Remove unused App methods."Craig Mautner2013-02-141-18/+0
|\ \ \ | |/ / | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Craig Mautner (1) * commit '534d136aa66fb13f7c1b482513627de45c218c29': Remove unused App methods.
| * | Remove unused App methods.Craig Mautner2013-02-131-18/+0
| | | | | | | | | | | | | | | | | | | | | Now that the Task methods have replaced the App methods remove the App methods. Change-Id: I0e7432f2c6f99708759ed8c871d20eb5bd38c3c2
| * | Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into ↵Chris Craik2013-02-131-0/+5
| |\ \ |/ / / | | | | | | 'goog/master'" DO NOT MERGE"
| * | Revert "Merge remote-tracking branch 'goog/master-chromium' into ↵Chris Craik2013-02-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'goog/master'" DO NOT MERGE This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f. Conflicts: packages/SystemUI/res/values-sv/strings.xml Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
* | | Merge "Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!"Dianne Hackborn2013-02-121-0/+5
|\ \ \
| * | | Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!Dianne Hackborn2013-02-121-0/+5
| |/ / | | | | | | | | | Change-Id: Ib05a2eb6a03db50074805a437a3639a7d10684a0
* | | am 36ee5485: am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat ↵Xavier Ducrohet2013-02-122-0/+38
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | for layoutlib." into jb-mr1.1-dev # Via Android Git Automerger (3) and others * commit '36ee5485b85e34008dc31e0f7bace1b2516c5db5': Fix DateFormat for layoutlib.
| * | am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." ↵Xavier Ducrohet2013-02-122-0/+38
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1.1-dev # Via Android Git Automerger (2) and others * commit '5d5c05dee9911eaf8add2d4298641e60f2a113d5': Fix DateFormat for layoutlib.
| | * \ am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into ↵Xavier Ducrohet2013-02-122-0/+38
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev # Via Android (Google) Code Review (1) and others * commit 'b7a4aed94eb02731057fdf78eb7bafc8ececadc9': Fix DateFormat for layoutlib.
| | | * \ am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-devXavier Ducrohet2013-02-122-0/+38
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Xavier Ducrohet (1) * commit 'f70b8c1cebbf873031bc92bb6ae3be813830d300': Fix DateFormat for layoutlib.
| | | | * | Fix DateFormat for layoutlib.Xavier Ducrohet2013-02-122-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I389c9d106b93b9f81dd3614398a5b66ba2b39a70
| * | | | | am ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-devJustin Koh2013-01-161-19/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'ba1992f8e9e50ca58f007ff528d2f6d2c2b18223': Remove doSingleCrunch call DO NOT MERGE
| | * | | | Remove doSingleCrunch call DO NOT MERGEJustin Koh2013-01-161-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove doSingleCrunch call as it's breaking jb-mr1-aah-dev. Change-Id: I0d8ee55344792fd868e74e07f31641a85e71168a
* | | | | | Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"Derek Sollenberger2013-02-061-5/+0
|\ \ \ \ \ \
| * \ \ \ \ \ am 573a18cc: Merge "Fixing the build"Svetoslav2013-01-291-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Svetoslav (1) * commit '573a18ccd883d18046dea600855d34f5c9a57fa8': Fixing the build
| * \ \ \ \ \ \ am 8fea4e72: Merge "Rework ParceledListSlice to be much easier to use."Dianne Hackborn2013-01-181-0/+6
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | * commit '8fea4e72e4dcff9fa76168b9e26cf5907102f70b': Rework ParceledListSlice to be much easier to use.
| * | | | | | | am 35654b61: More work on App Ops service.Dianne Hackborn2013-01-161-15/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '35654b61e8fe7bc85afcb076ddbb590d51c5865f': More work on App Ops service.
| * \ \ \ \ \ \ \ am b7de2194: resolved conflicts for merge of c71c678e to masterXavier Ducrohet2013-01-151-1/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b7de2194d54eb81b1db4b50c171ddd0339831155': Fix the single crunch command to return the right error code.
| * \ \ \ \ \ \ \ \ am 72c6137a: Handle empty flag attributes, such as gravity=""Tor Norbye2013-01-041-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '72c6137a7aa5e5ada6a4aeca52f33d060742beb6': Handle empty flag attributes, such as gravity=""
| * \ \ \ \ \ \ \ \ \ am 6fb9a983: Merge "Add single crunch command to aapt."Xavier Ducrohet2013-01-024-8/+62
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6fb9a983cefd9d0b75c2c68c161c03667afe339e': Add single crunch command to aapt.
| * \ \ \ \ \ \ \ \ \ \ Merge "Update framework to support r5967 of Skia." into master-chromiumDerek Sollenberger2012-12-191-5/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update framework to support r5967 of Skia.Derek Sollenberger2012-12-121-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 6906025 Change-Id: Iefdb830ec3aa2ab3472c1c142484a7aa21788a15
* | | | | | | | | | | | | App ops: add op for writing settings.Dianne Hackborn2013-02-051-0/+12
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix a build. And fix a bug that I think was introduced in the multi-user work that removed the permission check for writing to settings...! Change-Id: I5945682faa789ffc78fd3546c0df7d03693f106d
* | | | | | | | | | | | Fixing the buildSvetoslav2013-01-291-0/+6
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d47c7094efc8ff458cdac58a761d5f187c8fc32
* | | | | | | | | | | Rework ParceledListSlice to be much easier to use.Dianne Hackborn2013-01-181-0/+6
| |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take advantage of this to return better information about packages filtered by permissions -- include the permissions they have in the requested array. Also fix issue #8026793 (Contact picture shows default pic while searching for a contact in qsb) by using the base package name of the Context when reporting the app name of an operation. Otherwise you could make a resource-only context for another application and do calls through that and get reported as the wrong app. Change-Id: I5e0488bf773acea5a3d22f245641828e1a106fb8
* | | | | | | | | | More work on App Ops service.Dianne Hackborn2013-01-161-15/+19
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented reading and writing state to retain information across boots, API to retrieve state from it, improved location manager interaction to monitor both coarse and fine access and only note operations when location data is being delivered back to app (not when it is just registering to get the data at some time in the future). Also implement tracking of read/write ops on contacts and the call log. This involved tweaking the content provider protocol to pass over the name of the calling package, and some infrastructure in the ContentProvider transport to note incoming calls with the app ops service. The contacts provider and call log provider turn this on for themselves. This also implements some of the mechanics of being able to ignore incoming provider calls... all that is left are some new APIs for the real content provider implementation to be involved with providing the correct behavior for query() (return an empty cursor with the right columns) and insert() (need to figure out what URI to return). Change-Id: I36ebbcd63dee58264a480f3d3786891ca7cbdb4c
* | | | | | | | | resolved conflicts for merge of c71c678e to masterXavier Ducrohet2013-01-151-1/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a
| * | | | | | | am a4e10cc7: am 6080cc5f: resolved conflicts for merge of dd52dfed to ↵Xavier Ducrohet2013-01-151-0/+19
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-ub-dev * commit 'a4e10cc746caea514216f436e2065b3bbefb25ef': Fix the single crunch command to return the right error code.
| | * | | | | | am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-devXavier Ducrohet2013-01-151-0/+19
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '6080cc5fd7c332c79098a50605c0c37d99d4c481': Fix the single crunch command to return the right error code.
| | | * | | | | resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-devXavier Ducrohet2013-01-151-0/+19
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0
| | | | * | | | am de3b69e0: Merge "Fix the single crunch command to return the right error ↵Xavier Ducrohet2013-01-151-1/+5
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code." into jb-mr1-dev * commit 'de3b69e0512c00158333a223f6c53c9eac7b3d34': Fix the single crunch command to return the right error code.
| | | | | * | | | Fix the single crunch command to return the right error code.Xavier Ducrohet2013-01-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Casting from status_t to int doesn't work for return values if the lower 8 bits are all 0. Change-Id: I88e910dfe46cb72acd1595352e71da3c8eff4ca9
| | | | * | | | | am 22d7cf23: Add single crunch command to aapt. do not merge.Xavier Ducrohet2013-01-034-8/+62
| | | | |\ \ \ \ \ | | | |/ / / / / / | | | | | _ / / / | | | | | / / / | | | | | | | | * commit '22d7cf239d8a9b009ea7adf86d8826a8a8116d03': Add single crunch command to aapt. do not merge.
| | | | * | | | Add single crunch command to aapt. do not merge.Xavier Ducrohet2013-01-024-8/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the crunch command would work on a full res folder and output a full res folder (with only the drawables). This was only used in the SDK. The incremental logic is moved to the SDK build system so we change the crunch command (or rather add a new one) to only crunch a single file. (cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac) Change-Id: I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
| * | | | | | | am 23307cbb: am e0a676a3: Merge "Fix issue #7649590: Background windows ↵Dianne Hackborn2012-12-031-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes not being hidden for secondary users" into jb-mr1.1-dev * commit '23307cbb6b432b658b0fd7437dacfedd6298af94': Fix issue #7649590: Background windows sometimes not being hidden for secondary users
| | * | | | | | am e0a676a3: Merge "Fix issue #7649590: Background windows sometimes not ↵Dianne Hackborn2012-12-031-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being hidden for secondary users" into jb-mr1.1-dev * commit 'e0a676a3bb0e7b9aced9359a021e4c5d2ffef752': Fix issue #7649590: Background windows sometimes not being hidden for secondary users
| | | * | | | | Fix issue #7649590: Background windows sometimes not being hidden for ↵Dianne Hackborn2012-12-031-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | secondary users There are two things going on here: (1) In secondary users, some times theme information such as whether the window is full screen opaque was not being retrieved, so the window manager didn't know that it could hide the windows behind the app. This would just be a performance problem, except that: (2) There appear to be a number of applications that declare that they are full screen opaque, when in fact they are not. Instead they are using window surfaces with an alpha channel, and setting some pixels in their window to a non-opaque alpha level. This will allow you to see whatever is behind the app. If the system happens to completely remove the windows behind the app, and somebody is filling the frame buffer with black, then you will see what the app intends -- those parts of its UI blended with black. If one of those cases doesn't hold (and though we have never guaranteed they would, in practice this is generally what happens), then you will see something else. At any rate, if nothing else than for performance reasons, we need to fix issue #1. It turns out what is happening here is that the AttributeCache used by the activity manager and window manager to retreive theme and other information about applications has not yet been updated for multi-user. One of the things we retrieve from this is the theme information telling the window manager whether an application's window should be treated as full screen opaque, allowing it to hide any windows behind it. In the current implementation, the AttributeCache always retrieves this information about the application as the primary user (user 0). So, if you have an application that is installed on a secondary user but not installed on the primary user, when the AttributeCache tries to retrieve the requested information for it, then from the perspective of the primary user it considers the application not installed, and is not able to retrieve that info. The change here makes AttributeCache multi-user aware, keeping all of its data separately per-user, and requiring that callers now provide the user they want to retrieve information for. Activity manager and window manager are updated to be able to pass in the user when needed. This required some fiddling of the window manager to have that information available -- in particular it needs to be associated with the AppWindowToken. Change-Id: I4b50b4b3a41bab9d4689e61f3584778e451343c8
| | * | | | | am 5f958e9b: am 67b38c44: Cache resource ID lookups in aaptChristopher Tate2012-11-294-5/+148
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '5f958e9bfc793b3b653dfc88418bbd7745e633e1': Cache resource ID lookups in aapt
| | | * | | | Cache resource ID lookups in aaptChristopher Tate2012-11-284-5/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This speeds up certain workloads considerably, particularly those involved in buildling apps via the SDK. Windows-based use should particularly benefit from the change. (cherry picked from commit d8dde13a63565dcd72bcf03a5088407b737ba793) Change-Id: I33835bc64ade77688d41e8bfcd371b0a5f59d8fd
* | | | | | | Handle empty flag attributes, such as gravity=""Tor Norbye2013-01-041-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, an empty string will be passed into XmlUtils.convertValueToInt, which throws an index out of range exception. Change-Id: Ibd1a140e207653b205852087f33ccb87fbbb9bbc
* | | | | | Add single crunch command to aapt.Xavier Ducrohet2013-01-024-8/+62
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the crunch command would work on a full res folder and output a full res folder (with only the drawables). This was only used in the SDK. The incremental logic is moved to the SDK build system so we change the crunch command (or rather add a new one) to only crunch a single file. Change-Id: I635ee3e871d035b9db2fb593802d914e48241abf
* | | | | Remove remaining doc references to StyledAttributes.John Spurlock2012-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears StyledAttributes was renamed to TypedArray prior to fw 1.0. Leaving references to the old name around in the public docs is confusing. Deliberating leaving... tests/coretests/src/android/widget/LabelView.java ... as is - it's clearly unused. Change-Id: I3f66e5f9cbe945d9d86530d37b88369b401f054d
* | | | | Fixing the buildSvetoslav Ganov2012-12-141-3/+13
| |_|_|/ |/| | | | | | | | | | | Change-Id: I01349d65ac5915da090cfb018f99e0a508f9d5ad
generated by cgit v1.1 at 2025-01-28 12:03:28 +0000