drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
135,873 Commits 1 Branch 0 Tags
Commit Graph

2197 Commits

Author SHA1 Message Date
Deepanshu Gupta
779b59ced2 Merge "Add a script to rename fonts for SDK." 2014-05-16 20:27:11 +00:00
Amith Yamasani
891e65c5ce Merge "Variant of sendBroadcast with appOp flag for cross-user." 2014-05-16 19:40:20 +00:00
Amith Yamasani
3cf75729d5 Variant of sendBroadcast with appOp flag for cross-user. 
Needed for delivering SMS notifications to multiple users.

Change-Id: Ib772292699aba37144621742e6f0ee5c68aadd78
 2014-05-16 12:37:29 -07:00
Deepanshu Gupta
ad3f288311 Add a script to rename fonts for SDK. 
Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.

Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
 2014-05-16 12:31:24 -07:00
Deepanshu Gupta
528d876821 Merge "LayoutLib: Correctly resolve ?attr/foo" 2014-05-16 18:04:15 +00:00
Deepanshu Gupta
fba1dd24bf LayoutLib: Correctly resolve ?attr/foo 
?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
 2014-05-15 17:37:34 -07:00
Deepanshu Gupta
14c9b688fc Merge "Layoutlib: Update delegates for L" 2014-05-15 22:36:41 +00:00
Adam Lesinski
9e1e95f6e3 Merge "AAPT dump badging should allow refs in meta-data" 2014-05-15 21:17:33 +00:00
Adam Lesinski
b71adb6571 AAPT dump badging should allow refs in meta-data 
The framework allows references in the <meta-data>
element in an AndroidManifest.xml, so badging should
do the same.

Bug:14088271
Change-Id: Ia8157655e21adaf11b7ace90a98a9cca3c8a476c
 2014-05-15 14:14:41 -07:00
Adam Lesinski
4c1227e448 Merge "Fix crash in AAPT dump badging with bad StringPool" 2014-05-15 20:07:29 +00:00
Adam Lesinski
9cb2c68faf Fix crash in AAPT dump badging with bad StringPool 
With a malformed StringPool, AAPT dump badging would
crash trying to retrieve the name of an XML tag.

Bug:14658555
Change-Id: I6aa6c53c60b20725a461da2d3a39685c174b4d35
 2014-05-15 13:06:40 -07:00
Deepanshu Gupta
6376c407d4 Layoutlib: Update delegates for L 
Update delegate method signatures for L.

Change-Id: Ie607293bcae60b2d3a61d1cad3ac5f04bda2a238
 2014-05-15 09:30:11 -07:00
Deepanshu Gupta
14edfa8f65 am c1a74400: am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit 'c1a7440094c94f4369f04f062485c9ea1162a78b':
  Fix build
 2014-05-14 00:40:57 +00:00
Deepanshu Gupta
c1a7440094 am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '7dfe1fdac6f0306e1e31417d58a1a36d4280d2cc':
  Fix build
 2014-05-14 00:36:20 +00:00
Deepanshu Gupta
7dfe1fdac6 am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit 'c289ec6b465648d7d93e6f2dc9ed28822683f7d6':
  Fix build
 2014-05-14 00:31:15 +00:00
Deepanshu Gupta
c289ec6b46 am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '3a559d56a627687d56dc06cc459ef1e7e6b1cd79':
  Fix build
 2014-05-14 00:26:38 +00:00
Deepanshu Gupta
3a559d56a6 am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit 'b5b4756565a5f74c6eb2ca7f90ac839a4289daae':
  Fix build
 2014-05-14 00:21:33 +00:00
Deepanshu Gupta
b5b4756565 am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '98822f0eba746b4f8c8a622f21c2d32dad08453f':
  Fix build
 2014-05-14 00:15:24 +00:00
Deepanshu Gupta
6e923e1b51 am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '90d57721692e45fe6259136296e3cd5b669443fc':
  Fix build
 2014-05-14 00:05:35 +00:00
Deepanshu Gupta
90d5772169 am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '209745a32f0a68584aba57acf7c8d1de633b1cda':
  Fix build
 2014-05-14 00:00:05 +00:00
Deepanshu Gupta
209745a32f am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit 'c251147a2b6f461427b1ce49f7066fadc97c1faf':
  Fix build
 2014-05-13 23:55:17 +00:00
Deepanshu Gupta
85ec144538 am f266873c: am 1c55797d: Fix build 
* commit 'f266873c8059e78410bf43c83fb8f0fd5bfe3362':
  Fix build
 2014-05-13 23:45:30 +00:00
Deepanshu Gupta
f266873c80 am 1c55797d: Fix build 
* commit '1c55797d0e786b6594e769c2fa424e1b8386648e':
  Fix build
 2014-05-13 23:40:34 +00:00
Deepanshu Gupta
1c55797d0e Fix build 
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
 2014-05-13 15:47:04 -07:00
Deepanshu Gupta
e3950823b6 am 465a9926: am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 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]
 2014-05-13 21:43:52 +00:00
Deepanshu Gupta
465a99260e am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 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 '21dc46b14df9456eede9d4eb7082c85bec732058':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:37:58 +00:00
Deepanshu Gupta
21dc46b14d am 569dc64c: am 69ab5946: am fcfb8801: am 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 '569dc64cd6b0bb7bdfec97967b192d2a706e3f81':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:33:07 +00:00
Deepanshu Gupta
569dc64cd6 am 69ab5946: am fcfb8801: am 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 '69ab594625e274ed4ca6d4a1dc7f8fb19d44f020':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:28:18 +00:00
Deepanshu Gupta
69ab594625 am fcfb8801: am 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 'fcfb8801b27fd40ff27c380b8bad9b9a210effca':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:23:47 +00:00
Deepanshu Gupta
fcfb8801b2 am 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 '18b1525ac7666933befd6085461391ad1087b19a':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:18:03 +00:00
Deepanshu Gupta
ef24a5091b am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '900954e3cd135bf43db975961056e7661f26a6c6':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:07:40 +00:00
Deepanshu Gupta
900954e3cd am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '2100476ace68858bc7b7356b33aa525e38795592':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:02:19 +00:00
Deepanshu Gupta
2100476ace am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:00:19 +00:00
Deepanshu Gupta
964023c5dc am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '8bf73eae6c98532c8a597b885b948b9878555441':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 20:54:12 +00:00
Adam Lesinski
f38000cbd8 Merge "Quick fix to ensure mipmap doesn't get stripped by AAPT" 2014-05-13 18:39:17 +00:00
Deepanshu Gupta
425645c738 am 567f948b: am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit '567f948b60e9a647610454745b0629c136d492db':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 18:15:58 +00:00
Deepanshu Gupta
567f948b60 am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit '872a5a1a93eef53a18d18778104bb8669b4bc073':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 18:01:02 +00:00
Deepanshu Gupta
70efbad064 am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit 'bd5a3e6510e83b161a0e40c191d349524ae4a8e6':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 17:58:17 +00:00
Deepanshu Gupta
8bf73eae6c am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '0ad4f2cedde037c2b09a7f09c5f95f0984267c64':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 17:58:14 +00:00
Adam Lesinski
3921e87e6e Quick fix to ensure mipmap doesn't get stripped by AAPT 
This is a quick fix. A refactoring is already underway to properly
solve this problem.

Bug:14857725
Change-Id: Ic0c475aa0b180803a687904ad9f71eb87e137a25
 2014-05-13 10:57:53 -07:00
Deepanshu Gupta
872a5a1a93 am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit '01fefec9397569cf9c7c5b599c16126f1b4d6870':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:55:41 +00:00
Deepanshu Gupta
bd5a3e6510 am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit '1677a9bdeba3961625236925e754920fca1b7e89':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 17:53:55 +00:00
Deepanshu Gupta
01fefec939 am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit '5fc8f945ee6a763b08e47019319432ec71ba1d1a':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:50:45 +00:00
Deepanshu Gupta
5fc8f945ee am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit 'b0f2ded5e9e84fb51ec5b2cb6b419b040b008276':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:45:43 +00:00
Deepanshu Gupta
0ad4f2cedd resolved conflicts for merge of 7377c7be to jb-mr1-dev 
Change-Id: I26d2e3478536826608413094e17cd36da43b4e23
 2014-05-13 10:44:24 -07:00
Deepanshu Gupta
5454be00b1 am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '5dae7fda38850a5146a6b8a4edbfd9aa96aea484':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 17:42:09 +00:00
Deepanshu Gupta
d388afada2 am b6de60e0: am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit 'b6de60e0020dbed906b1d275de17f8c615b2b242':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 17:42:06 +00:00
Deepanshu Gupta
b161d6ba7f am 673d9734: resolved conflicts for merge of 00d09649 to jb-mr1-dev 
* commit '673d9734c2d9b62ecd41dcac3c730d242952989e':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 17:42:00 +00:00
Deepanshu Gupta
5dae7fda38 am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '9359dc2e7d6bc671af3fee0c1dc540dd3685365c':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 17:40:55 +00:00
Deepanshu Gupta
b6de60e002 am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit 'df2da3d7c9f82ff2304f630f4ff9fc2cb3001c6f':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 17:40:52 +00:00