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

872 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Deepanshu Gupta
673d9734c2 resolved conflicts for merge of 00d09649 to jb-mr1-dev 
Change-Id: Ib3c34a1989d4251c3ac4755c52fe05a81644930a
 2014-05-13 10:17:09 -07:00
Deepanshu Gupta
cc9e359699 am 5280c911: am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '5280c911d81a7db5ec8854850bef60d8b0951358':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 17:14:17 +00:00
Deepanshu Gupta
9978c0363e am 1867f58d: am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '1867f58d6ceebac899b60b029e34f3a1fcabba7f':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 17:14:12 +00:00
Deepanshu Gupta
8e015b7ba4 am a5461ebf: resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev 
* commit 'a5461ebfaebf3337a0cf1c752334f23de145a6d1':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 17:14:09 +00:00
Deepanshu Gupta
5280c911d8 am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '0df5ae65a91174c99d1af633b45b3a1a7861cd1c':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 17:11:26 +00:00
Deepanshu Gupta
1867f58d6c am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '3027b69e154cffc6e286caf90b0f9af01c473c14':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 17:11:20 +00:00
Deepanshu Gupta
a5461ebfae resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev 
Change-Id: I5c4634897882deb663f32d8148202d7c9189521d
 2014-05-13 09:40:35 -07:00
Deepanshu Gupta
0f26b51025 am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '9053261a5413f401168d25fa4a9749723b232949':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 16:36:56 +00:00
Deepanshu Gupta
627cab1257 am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '45693e50ecdae9b456e4974dd91758f9e25df2b4':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 16:36:50 +00:00
Deepanshu Gupta
effef17297 am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'e3b43270e87fd85a6281c91f2897233aac6b6397':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 16:36:48 +00:00
Deepanshu Gupta
c3a0c9f679 am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '45ca5ba7dc3b70dd39991217894eed114eefb1b8':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 16:36:45 +00:00
Deepanshu Gupta
835cbaa192 am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit '9f9652587dd08e5a4f7c8195eb904cd0f0c3f6c4':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 16:36:42 +00:00
Deepanshu Gupta
ce9e87f743 am 8c5c2410: am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE] 
* commit '8c5c2410ae9df60d9462784370965a0417e06fa4':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 16:36:39 +00:00
Deepanshu Gupta
8a4f39351f am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '48bf7b49bb361a4084e5fb4c6d0ae497a606c700':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 16:36:36 +00:00
Deepanshu Gupta
838e54826b am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '94d33cfce1f32af4480f941fdd6c9942bb203d2c':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 16:36:33 +00:00
Deepanshu Gupta
df8a15b31e am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'd4e6727d02f7507fdfd6cbbabd03d6e922127e4b':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 16:36:30 +00:00
Deepanshu Gupta
520f585bc6 am 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] 
* commit '2cbe100a9bc6d2b3bf828432a1527f0ac239e575':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 16:36:25 +00:00
Deepanshu Gupta
2c167d0f6a am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] 
* commit '632c9e2dabc44b24f04c3418e4a3540b22db792b':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 16:36:22 +00:00
Deepanshu Gupta
9053261a54 am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 16:32:02 +00:00
Deepanshu Gupta
45693e50ec am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit 'c9a4badb54320f8c52d2da06a762b5e6eef00ee0':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 16:31:53 +00:00
Deepanshu Gupta
e3b43270e8 am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'bdd8fbf6eae886dc3b2cd716745ede918773a2c4':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 16:31:50 +00:00
Deepanshu Gupta
45ca5ba7dc am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '01cdd3123f408dc41a2bd4786f3a943157ab6c69':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 16:31:47 +00:00