summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Make --non-constant-id generates non final IDs for styleable."Xavier Ducrohet2013-04-131-12/+5
| | | | This reverts commit 8730f46ae5ba9021a0e01c068ffc6b552b6c4510.
* Make --non-constant-id generates non final IDs for styleable.Xavier Ducrohet2013-04-121-5/+12
| | | | | | | | | | This was already done for all other types of resources, but not for styleable (or the constants for the styleable array indices). This fixes this. This only affects the SDK as this is used by the SDK toolchain only. Change-Id: Idfc2f7915be2b0e88590f38fd660610ffc7e160c
* Add liblogYing Wang2013-04-093-4/+6
| | | | | Bug: 8580410 Change-Id: I746aa8258866508c3a725d0773faf4518096548f
* Merge "Queues, queues, queues and input." into jb-mr2-devJeff Brown2013-04-083-23/+10
|\
| * Queues, queues, queues and input.Jeff Brown2013-04-083-23/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesigned how ViewRootImpl delivers input events to views, the IME and to native activities to fix several issues. The prior change to make IME input event delegation use InputChannels failed to take into account that InputMethodManager is a singleton attached to the main looper whereas UI may be attached to any looper. Consequently interactions with the InputChannel might occur on the wrong thread. Fixed this problem by checking the current thread and posting input events or callbacks to the correct looper when necessary. NativeActivity has also been broken for a while because the default event handling logic for joysticks and touch navigation was unable to dispatch events back into the native activity. In particular, this meant that DPad synthesis from touch navigation would not work in any native activity. The plan is to fix this problem by passing all events through ViewRootImpl as usual then forwarding them to native activity as needed. This should greatly simplify IME pre-dispatch and system key handling and make everything more robust overall. Fixed issues related to when input events are synthesized. In particular, added a more robust mechanism to ensure that synthetic events are canceled appropriately when we discover that events are no longer being resynthesized (because the application or IME is handling or dropping them). The new design is structured as a pipeline with a chain of responsibility consisting of InputStage objects. Each InputStage is responsible for some part of handling each input event such as dispatching to the view hierarchy or to the IME. As a stage processes an input event, it has the option of finishing the event, forwarding the event to the next stage or handling the event asynchronously. Some queueing logic takes care to ensure that events are forwarded downstream in the correct order even if they are handled out of order by a given stage. Cleaned up the InputMethodManager singleton initialization logic to make it clearer that it must be attached to the main looper. We don't actually need to pass this looper around. Deleted the LatencyTimer class since no one uses it and we have better ways of measuring latency these days using systrace. Added a hidden helper to Looper to determine whether the current thread is the indicated Looper thread. Note: NativeActivity's IME dispatch is broken by this patch. This will be fixed later in another patch. Bug: 8473020 Change-Id: Iac2a1277545195a7a0137bbbdf04514c29165c60
* | Merge "aapt: add support for optional uses-permission" into jb-mr2-devNick Kralevich2013-04-051-0/+8
|\ \ | |/ |/|
| * aapt: add support for optional uses-permissionNick Kralevich2013-04-031-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Applications can request a permission with android:required="false". For example: <uses-permission android:name="android.permission.READ_PHONE_STATE" android:required="false" /> Make aapt understand such permissions. Bug: 8522021 Change-Id: I7d3af64e7c3eca608316d5bea19c4ea639dd2b7a
* | FUL now restarts when flipping tablet 180 (bug 7484464)Brian Colonna2013-03-291-0/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | When a tablet rotates, FUL must be stopped and restarted in a new position. 90 degree rotations cause a configuration change, causing FUL to be automatically reconstructed in the new location. However, a 180 degree rotation is not a configuration change, so FUL was not restarting. A 180 degree rotation happens more often than one might think. If you set the tablet down and later picked it up in the opposite orientation, FUL would not work prior to this fix. This change adds a rotation watcher to KeyguardFaceUnlockView. It watches for 180 degree rotations and stops and restarts FUL accordingly. The rotation watcher callback must be unregistered when KeyguardFaceUnlockView is recreated (as during 90 degree rotation changes), otherwise the number of rotation watcher callbacks will keep growing and they will never go away. This is a problem not just because there are many callbacks hanging around, but also because the old callbacks end up trying to access biometric unlock views that no longer exist, resulting in crashes. So, a simple function was added to the window manager to unregister a rotation watcher. Change-Id: Ie1ef20a9a22b8f4e39918987dff2b8ad444fcfd1
* Fix build.Dianne Hackborn2013-03-261-0/+21
| | | | Change-Id: I51b87ee5f0b7f396aad7e239893d9f0764f04bb6
* Fix build.Dianne Hackborn2013-03-051-0/+7
| | | | Change-Id: Iaa70b05a3cfd372518ec35aa8bcea2f9d78b8292
* Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-devCraig Mautner2013-02-261-0/+18
|\
| * Revert ActivityManager changes for tasks. DO NOT MERGECraig Mautner2013-02-251-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keeping all activity=>task changes in master and removing them from jb-mr2. Revert "Update histories simultaneously." Revert "Add null check to setAppGroupId." Revert "Fix crashing bug in validator." Revert "Switch topRunning* and moveTaskTo*" Revert "Begin switch over to task based history." Revert "Reset and reuse Iterators and don't new() one." Revert "Remove AppWindowToken lists." Revert "Fix build." Revert "Remove unused App methods." Revert "Stop using AppToken movement and start using Task." Revert "Replace access to mAppTokens with AppTokenIterator" Revert "Refactor setAppOpVisibility implementation." Revert "Add AppWindowTokens to TaskList." Revert "Make ActivityStack.mHistory private." Revert "Migrate AppWindowToken lists into DisplayContent." Change-Id: I5722c9a4956dccb52864207e2967690bc58e4ebb
* | Fix typo.Dianne Hackborn2013-02-251-1/+1
|/ | | | Change-Id: I71c8458e02dc9b9a4c59e51ded37b57a930038f9
* Formalize overscan metrics.Dianne Hackborn2013-02-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The window manager now maintains and reports a new formal "overscan insets" for each window, much like the existing content and visible insets. This is used to correctly position the various UI elements in the various combination of layout options. In particular, this allows us to have an activity that is using fitSystemWindows to have the content of its UI extend out to the visible content part of the screen while still positioning its fixed UI elements inside the standard content rect (and the entire window extending all the way into the overscan area to fill the screen as desired). Okay, maybe that is not written so clearly. Well, it made my head hurt too, so suffer! The key thing is that windows now need to know about three rectangles: the overall rectangle of the window, the rectangle inside of the overscan area, and the rectangle inside of the content area. The FLAG_LAYOUT_IN_OVERSCAN option controls whether the second rectangle is pushed out to fill the entire overscan area. Also did some improvements to debug dumping in the window manager. Change-Id: Ib2368c4aff5709d00662c799507c37b6826929fd
* am ec6156f9: Merge "Fix the build."Jim Miller2013-02-201-0/+8
|\ | | | | | | | | * commit 'ec6156f9e884ba85c76a9c4683f83f18b3f64afa': Fix the build.
| * Fix the build.Jim Miller2013-02-201-0/+8
| | | | | | | | Change-Id: If53878937fe1ca01ad8db9f9d201d0f9aaaec81b
* | 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