summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | | | | | | | | | am 465a9926: am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am ↵Deepanshu Gupta2014-05-131-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev * commit '465a99260ea1d868e9aa43d08e63cb85892f188e': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| * | | | | | | | | | | | | | am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ↵Deepanshu Gupta2014-05-131-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev * commit '21dc46b14df9456eede9d4eb7082c85bec732058': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| | * | | | | | | | | | | | | am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am ↵Deepanshu Gupta2014-05-131-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev * commit '569dc64cd6b0bb7bdfec97967b192d2a706e3f81': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| | | * | | | | | | | | | | | am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am ↵Deepanshu Gupta2014-05-131-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev * commit '69ab594625e274ed4ca6d4a1dc7f8fb19d44f020': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| | | | * | | | | | | | | | | am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am ↵Deepanshu Gupta2014-05-131-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev * commit 'fcfb8801b27fd40ff27c380b8bad9b9a210effca': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| | | | | * | | | | | | | | | am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am ↵Deepanshu Gupta2014-05-131-0/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev * commit '18b1525ac7666933befd6085461391ad1087b19a': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| | | | | | * | | | | | | | | am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am ↵Deepanshu Gupta2014-05-131-0/+2
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev * commit '900954e3cd135bf43db975961056e7661f26a6c6': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| | | | | | | * | | | | | | | am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved ↵Deepanshu Gupta2014-05-131-0/+2
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts for merge of 7377c7be to jb-mr1-dev * commit '2100476ace68858bc7b7356b33aa525e38795592': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| | | | | | | | * | | | | | | am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for ↵Deepanshu Gupta2014-05-131-0/+2
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge of 7377c7be to jb-mr1-dev * commit '31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| | | | | | | | | * | | | | | am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-devDeepanshu Gupta2014-05-131-0/+2
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8bf73eae6c98532c8a597b885b948b9878555441': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| | | | | | | | | | * | | | | am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-devDeepanshu Gupta2014-05-131-0/+2
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ad4f2cedde037c2b09a7f09c5f95f0984267c64': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| | | | | | | | | | | * | | | resolved conflicts for merge of 7377c7be to jb-mr1-devDeepanshu Gupta2014-05-131-0/+2
| | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26d2e3478536826608413094e17cd36da43b4e23
| | | | | | | | | | | | * | | am 3a115628: Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]Deepanshu Gupta2014-05-132-6/+8
| | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a115628236ee9051518d4f96840cbb76070cf92': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| | | | | | | | | | | | | * | | Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]Deepanshu Gupta2014-05-072-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the right value for presence of software navigation bar in BridgeWindowManager. This is required to render the overflow menu button correctly in the Action Bar. Change-Id: I73de3b299f6a3a113425c436a59e800cd1d6b97f
| | | | | | | | | | * | | | | | am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute ↵Deepanshu Gupta2014-05-132-3/+26
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for menus [DO NOT MERGE] * commit '5dae7fda38850a5146a6b8a4edbfd9aa96aea484': Support actionProviderClass attribute for menus [DO NOT MERGE]
| | | | | | | | | | | * | | | | am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus ↵Deepanshu Gupta2014-05-132-3/+26
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DO NOT MERGE] * commit '9359dc2e7d6bc671af3fee0c1dc540dd3685365c': Support actionProviderClass attribute for menus [DO NOT MERGE]
| | | | | | | | | | | | * | | | am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]Deepanshu Gupta2014-05-132-3/+26
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d3fa7ba782238afb891db38e29ef7ec755bfdf6': Support actionProviderClass attribute for menus [DO NOT MERGE]
| | | | | | | | | | | | | * | | Support actionProviderClass attribute for menus [DO NOT MERGE]Deepanshu Gupta2014-05-072-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change adds support for view cookies for actionProviderClasses (for example, ShareActionProvider) in the action bar menus. This also provides a more robust search for the overflowMenuButton. Change-Id: I316c8b9a69e2e337b41ba0fe4e61af9fe850f750 (cherry picked from commit 099f40a950a14b66005b17657d967ef080569a15)
| | | | | | | | | | * | | | | | am b6de60e0: am df2da3d7: am 7bc363ba: Add special system view cookie to ↵Deepanshu Gupta2014-05-131-1/+28
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OverflowButton. [DO NOT MERGE] * commit 'b6de60e0020dbed906b1d275de17f8c615b2b242': Add special system view cookie to OverflowButton. [DO NOT MERGE]
| | | | | | | | | | | * | | | | am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. ↵Deepanshu Gupta2014-05-131-1/+28
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DO NOT MERGE] * commit 'df2da3d7c9f82ff2304f630f4ff9fc2cb3001c6f': Add special system view cookie to OverflowButton. [DO NOT MERGE]
| | | | | | | | | | | | * | | | am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE]Deepanshu Gupta2014-05-131-1/+28
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7bc363ba72d4cdd9a0b3b1601e432acfc09c0dc0': Add special system view cookie to OverflowButton. [DO NOT MERGE]
| | | | | | | | | | | | | * | | Add special system view cookie to OverflowButton. [DO NOT MERGE]Deepanshu Gupta2014-05-071-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a special view cookie to enable the IDE to identify the overflow menu button in the Action Bar. Change-Id: Ida3ed776afb8c9fa8af23b73d4cf6d47eef0ab87 (cherry picked from commit 7c6f6481f46b8244406790604c5f8b3f712c369f)