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

2218 Commits

Author SHA1 Message Date
Craig Mautner
8bd94d502d implement keyguardGoingAway() fixes build. 
Fix bug 15326529.

Change-Id: I9095fe70721bfb031dd1080da1d61ff4e1a8c8ab
 2014-05-29 10:53:46 -07:00
Deepanshu Gupta
85c69944bd Merge "Recurse into directories to find fonts. [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:38:17 +00:00
Deepanshu Gupta
f251b06089 Merge "Parallel processing of the fonts. [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:37:55 +00:00
Deepanshu Gupta
28b13b2332 Merge "Add multiple dir support to build_font.py [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:37:45 +00:00
Deepanshu Gupta
2cb50d45a8 Merge "Layoutlib: Fix FontFamily_Delegate use after unref" into lmp-preview-dev 2014-05-29 15:37:24 +00:00
Deepanshu Gupta
1a5b0de877 Merge "Update delegates" into lmp-preview-dev 2014-05-29 15:37:07 +00:00
Xavier Ducrohet
7ee26070ea Merge "Stopgap fix for layoutlib." into lmp-preview-dev 2014-05-29 05:27:32 +00:00
Brian Carlstrom
312da405eb Tracking ActionBarView change 1181f77bdfaa7bf8a8250cdd13c7b7a1d6ee0c44 
Change-Id: I29a486557428806f26f900974e74f42f3afa4ad4
 2014-05-28 21:43:35 -07:00
Brian Carlstrom
8c9360f3aa Tracking IWindowManager change 2ea3814083f27567ae07a1b449da3d596dd4d9d5 
Change-Id: I6945cc9b4be174b55173ac2081edc5ee1bee6e67
 2014-05-28 21:37:52 -07:00
Deepanshu Gupta
dc62340f18 Stopgap fix for layoutlib. 
This is a temporary fix for changes made to TypedArray regrading theme
attributes.

Change-Id: I173fde6d8d3259479b0654ff331bc27bf2814fb0
 2014-05-28 16:52:01 -07:00
Deepanshu Gupta
9113968f95 Layoutlib: Fix FontFamily_Delegate use after unref 
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
 2014-05-28 16:15:32 -07:00
Deepanshu Gupta
79ee46172b Update delegates 
Update layoutlib delegates in response to commit
a631a36de986acea2ef6fdfbaf3441a28b914b15

Change-Id: I897a7e3a61286bfae9054415d555febe16410106
 2014-05-28 15:04:50 -07:00
Deepanshu Gupta
baef8c1ffe Layoutlib fixes for L [DO NOT MERGE] 
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)
 2014-05-27 18:01:34 -07:00
Deepanshu Gupta
46eff27c32 Recurse into directories to find fonts. [DO NOT MERGE] 
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)
 2014-05-27 17:57:05 -07:00
Deepanshu Gupta
d23417ab5d Parallel processing of the fonts. [DO NOT MERGE] 
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)
 2014-05-27 17:56:29 -07:00
Deepanshu Gupta
49a60d4d6d Add multiple dir support to build_font.py [DO NOT MERGE] 
Change-Id: I705d3fbad688a0db309d3062463bf206442b2709
(cherry picked from commit 7e149f02c4e4403101e7e0e88af36cd4ab6f3554)
 2014-05-27 17:55:40 -07:00
Adam Lesinski
e34b8abf3a Merge "Don't dump data from a bad ResTable" 2014-05-21 21:59:33 +00:00
Jeff Brown
e665221764 am c2871696: am 6099fd21: Merge "Fix build." into klp-modular-dev 
* commit 'c28716964c4525bf9a291404d7f14e74de23f36f':
  Fix build.
 2014-05-21 11:16:58 +00:00
Jeff Brown
c28716964c am 6099fd21: Merge "Fix build." into klp-modular-dev 
* commit '6099fd21e190ffdf8e03ba6d96cce0d53c2765fd':
  Fix build.
 2014-05-21 08:40:39 +00:00
Jeff Brown
61116acdc6 Fix build. 
Change-Id: I00f040ab16cf8a3b7a995b4626d49e70b97fb294
 2014-05-20 22:16:25 -07:00
Adam Lesinski
25e9d55e96 Don't dump data from a bad ResTable 
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
 2014-05-19 15:01:43 -07:00
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