summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Per-app media directories on external storage.Jeff Sharkey2014-05-301-0/+6
| | | | | | | | | | This change defines per-app directories on external storage that will be scanned and included in MediaStore. This gives apps a way to write content to secondary shared storage in a way that can easily be surfaced to other apps. Bug: 14382377 Change-Id: I4cb367c870509e76f0c2c598f01e2f699780030a
* implement keyguardGoingAway() fixes build.Craig Mautner2014-05-291-0/+4
| | | | | | Fix bug 15326529. Change-Id: I9095fe70721bfb031dd1080da1d61ff4e1a8c8ab
* Merge "Recurse into directories to find fonts. [DO NOT MERGE]" into ↵Deepanshu Gupta2014-05-291-7/+11
|\ | | | | | | lmp-preview-dev
| * Recurse into directories to find fonts. [DO NOT MERGE]Deepanshu Gupta2014-05-271-7/+11
| | | | | | | | | | | | | | | | | | | | | | We now recurse into directories to find all fonts. This change is needed to prevent having to list all fonts in external/google-fonts individually. As a side effect, we now only copy xml files over. Change-Id: Ifdea3b8451878c2449ac7c5e17ef3d1b00d1b955 (cherry picked from commit c6364fd90de1600526d3431ce0740b6b856e48f0)
* | Merge "Parallel processing of the fonts. [DO NOT MERGE]" into lmp-preview-devDeepanshu Gupta2014-05-291-37/+60
|\ \ | |/
| * Parallel processing of the fonts. [DO NOT MERGE]Deepanshu Gupta2014-05-271-37/+60
| | | | | | | | | | | | | | | | | | | | Font renaming for the SDK is now done in parallel. This now reduces the running time for this script from about 30 mins to about 5 to 10 mins. More speedup is expected when fonttools is updated. Change-Id: I2c405f6d3e637e3067c8a1653e3cae206c32c0c3 (cherry picked from commit c6364fd90de1600526d3431ce0740b6b856e48f0)
* | Merge "Add multiple dir support to build_font.py [DO NOT MERGE]" into ↵Deepanshu Gupta2014-05-291-44/+51
|\ \ | |/ | | | | lmp-preview-dev
| * Add multiple dir support to build_font.py [DO NOT MERGE]Deepanshu Gupta2014-05-271-44/+51
| | | | | | | | | | Change-Id: I705d3fbad688a0db309d3062463bf206442b2709 (cherry picked from commit 7e149f02c4e4403101e7e0e88af36cd4ab6f3554)
* | Merge "Layoutlib: Fix FontFamily_Delegate use after unref" into lmp-preview-devDeepanshu Gupta2014-05-292-6/+10
|\ \
| * | Layoutlib: Fix FontFamily_Delegate use after unrefDeepanshu Gupta2014-05-282-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | FontFamily_Delegate was being reused after the nUnref call. The issue is fixed by storing the reference to the FontFamily_Delegate directly in the Typeface_Delegate rather than storing the native pointer. Change-Id: I0db724a83c4be3d7b64ccba0989cd64129f2a785
* | | Merge "Update delegates" into lmp-preview-devDeepanshu Gupta2014-05-296-67/+2
|\ \ \
| * | | Update delegatesDeepanshu Gupta2014-05-286-67/+2
| | |/ | |/| | | | | | | | | | | | | | | | Update layoutlib delegates in response to commit a631a36de986acea2ef6fdfbaf3441a28b914b15 Change-Id: I897a7e3a61286bfae9054415d555febe16410106
* | | Merge "Stopgap fix for layoutlib." into lmp-preview-devXavier Ducrohet2014-05-292-3/+12
|\ \ \
| * | | Stopgap fix for layoutlib.Deepanshu Gupta2014-05-282-3/+12
| | |/ | |/| | | | | | | | | | | | | | | | This is a temporary fix for changes made to TypedArray regrading theme attributes. Change-Id: I173fde6d8d3259479b0654ff331bc27bf2814fb0
* | | Tracking ActionBarView change 1181f77bdfaa7bf8a8250cdd13c7b7a1d6ee0c44Brian Carlstrom2014-05-281-1/+1
| | | | | | | | | | | | Change-Id: I29a486557428806f26f900974e74f42f3afa4ad4
* | | Tracking IWindowManager change 2ea3814083f27567ae07a1b449da3d596dd4d9d5Brian Carlstrom2014-05-281-1/+1
|/ / | | | | | | Change-Id: I6945cc9b4be174b55173ac2081edc5ee1bee6e67
* | Layoutlib fixes for L [DO NOT MERGE]Deepanshu Gupta2014-05-2712-600/+419
|/ | | | | | | | | | | This adds the new delegates that were missing. This starts the work on changes related to Minikin Fonts. There are some changes related to TypedArray that still need to be fixed. Change-Id: Ic2397b64aa3f1f48926e849b14689c47d9ee7f8c (cherry picked from commit 7ca3612094270183243938e79337c84effea7ad0)
* Merge "Don't dump data from a bad ResTable"Adam Lesinski2014-05-212-0/+11
|\
| * Don't dump data from a bad ResTableAdam Lesinski2014-05-192-0/+11
| | | | | | | | | | | | | | | | | | AAPT dumps data from a bad ResTable, which causes crashes. Prevent this by checking if there were errors when creating the ResTable. Bug:14902008 Change-Id: I5e04ebf967c60b78c511dd175785a13bca52f09a
* | am c2871696: am 6099fd21: Merge "Fix build." into klp-modular-devJeff Brown2014-05-211-1/+1
|\ \ | |/ |/| | | | | * commit 'c28716964c4525bf9a291404d7f14e74de23f36f': Fix build.
| * am 6099fd21: Merge "Fix build." into klp-modular-devJeff Brown2014-05-211-1/+1
| |\ | | | | | | | | | | | | * commit '6099fd21e190ffdf8e03ba6d96cce0d53c2765fd': Fix build.
| | * Fix build.Jeff Brown2014-05-201-1/+1
| | | | | | | | | | | | Change-Id: I00f040ab16cf8a3b7a995b4626d49e70b97fb294
* | | Merge "Add a script to rename fonts for SDK."Deepanshu Gupta2014-05-164-0/+174
|\ \ \
| * | | Add a script to rename fonts for SDK.Deepanshu Gupta2014-05-164-0/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a script that will rename the PS name encoded in the font that is to be shipped with the SDK. Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
* | | | Merge "Variant of sendBroadcast with appOp flag for cross-user."Amith Yamasani2014-05-161-0/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Variant of sendBroadcast with appOp flag for cross-user.Amith Yamasani2014-05-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Needed for delivering SMS notifications to multiple users. Change-Id: Ib772292699aba37144621742e6f0ee5c68aadd78
* | | | Merge "LayoutLib: Correctly resolve ?attr/foo"Deepanshu Gupta2014-05-161-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | LayoutLib: Correctly resolve ?attr/fooDeepanshu Gupta2014-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ?attr/foo in platform files wasn't resolved properly. The IDE checked the app namespace for the attribute even though it is being referenced from a platform file. Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
* | | | Merge "Layoutlib: Update delegates for L"Deepanshu Gupta2014-05-155-29/+32
|\ \ \ \
| * | | | Layoutlib: Update delegates for LDeepanshu Gupta2014-05-155-29/+32
| |/ / / | | | | | | | | | | | | | | | | | | | | Update delegate method signatures for L. Change-Id: Ie607293bcae60b2d3a61d1cad3ac5f04bda2a238
* | | | Merge "AAPT dump badging should allow refs in meta-data"Adam Lesinski2014-05-151-1/+1
|\ \ \ \
| * | | | AAPT dump badging should allow refs in meta-dataAdam Lesinski2014-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The framework allows references in the <meta-data> element in an AndroidManifest.xml, so badging should do the same. Bug:14088271 Change-Id: Ia8157655e21adaf11b7ace90a98a9cca3c8a476c
* | | | | Merge "Fix crash in AAPT dump badging with bad StringPool"Adam Lesinski2014-05-151-7/+38
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix crash in AAPT dump badging with bad StringPoolAdam Lesinski2014-05-151-7/+38
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a malformed StringPool, AAPT dump badging would crash trying to retrieve the name of an XML tag. Bug:14658555 Change-Id: I6aa6c53c60b20725a461da2d3a39685c174b4d35
* | | | am c1a74400: am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am ↵Deepanshu Gupta2014-05-141-1/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build * commit 'c1a7440094c94f4369f04f062485c9ea1162a78b': Fix build
| * | | am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am ↵Deepanshu Gupta2014-05-141-1/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build * commit '7dfe1fdac6f0306e1e31417d58a1a36d4280d2cc': Fix build
| | * | am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am ↵Deepanshu Gupta2014-05-141-1/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build * commit 'c289ec6b465648d7d93e6f2dc9ed28822683f7d6': Fix build
| | | * \ am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am ↵Deepanshu Gupta2014-05-141-1/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build * commit '3a559d56a627687d56dc06cc459ef1e7e6b1cd79': Fix build
| | | | * \ am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am ↵Deepanshu Gupta2014-05-141-1/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build * commit 'b5b4756565a5f74c6eb2ca7f90ac839a4289daae': Fix build
| | | | | * \ am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am ↵Deepanshu Gupta2014-05-141-1/+0
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85ec1445: am f266873c: am 1c55797d: Fix build * commit '98822f0eba746b4f8c8a622f21c2d32dad08453f': Fix build
| | | | | | * \ am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am ↵Deepanshu Gupta2014-05-141-1/+0
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c55797d: Fix build * commit '90d57721692e45fe6259136296e3cd5b669443fc': Fix build
| | | | | | | * \ am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix buildDeepanshu Gupta2014-05-141-1/+0
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '209745a32f0a68584aba57acf7c8d1de633b1cda': Fix build
| | | | | | | | * \ am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix buildDeepanshu Gupta2014-05-131-1/+0
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c251147a2b6f461427b1ce49f7066fadc97c1faf': Fix build
| | | | | | | | | * \ am f266873c: am 1c55797d: Fix buildDeepanshu Gupta2014-05-131-1/+0
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f266873c8059e78410bf43c83fb8f0fd5bfe3362': Fix build
| | | | | | | | | | * \ am 1c55797d: Fix buildDeepanshu Gupta2014-05-131-1/+0
| | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1c55797d0e786b6594e769c2fa424e1b8386648e': Fix build
| | | | | | | | | | | * | Fix buildDeepanshu Gupta2014-05-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove a line that shouldn't have been merged into this branch. The build will still be broken for this branch, but this will fix it for many branches downstream. Change-Id: I2f556636640eb823dc2834afae7b536e79b79607
| | | | | | | | | | * | | am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 ↵Deepanshu Gupta2014-05-131-1/+1
| | | | | | | | | | |\ \ \ | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly" into jb-dev-plus-aosp * commit 'bd5a3e6510e83b161a0e40c191d349524ae4a8e6': resolve conflicts for merge 5a7b3b65 correctly
| | | | | | | | | | | * | am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into ↵Deepanshu Gupta2014-05-131-1/+1
| | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev-plus-aosp * commit '1677a9bdeba3961625236925e754920fca1b7e89': resolve conflicts for merge 5a7b3b65 correctly
| | | | | | | | | | | | * \ Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aospDeepanshu Gupta2014-05-131-1/+1
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * | resolve conflicts for merge 5a7b3b65 correctlyDeepanshu Gupta2014-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84
generated by cgit v1.1 at 2025-01-05 15:18:45 +0000