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

123925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
d0f215756a am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '3c1d72c2ef1819e0de5599761b21f00351ca3feb':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:49:37 +00:00
Deepanshu Gupta
2bc3df2e3c am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'b97ac2b6acc84b02ebe16a8c875bae5cfd0898f2':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:49:35 +00:00
Deepanshu Gupta
7e49737d80 am fb6e2f3b: am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'fb6e2f3b56fc067c634c122d605abe3841c309a9':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:49:32 +00:00
Deepanshu Gupta
b97ac2b6ac am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'c8414f11d7738dafc530178fd6dfa365d8b3d884':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:47:34 +00:00
Deepanshu Gupta
fb6e2f3b56 am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '9bfbe93a7e7165a7daef68175aa7dde9dbe0223a':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:47:30 +00:00
Deepanshu Gupta
896bdbea56 am 01041ec0: am 7e0b1d59: am d056218b: am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '01041ec00e671b5d52880ded067f044136470c0c':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:44:53 +00:00
Deepanshu Gupta
c8414f11d7 am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '4dcb4a1f03abb2a4d3f1ceb9aed0feb6264ebfb5':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:43:53 +00:00
Deepanshu Gupta
9bfbe93a7e am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'dd46bfd09522fa7450293bbcb2f3ae5ecc85b882':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:43:50 +00:00
Deepanshu Gupta
3c1d72c2ef am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'ab869de19efc24265eebda19a97628713e072178':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:41:34 +00:00
Deepanshu Gupta
4dcb4a1f03 am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '236b71649ce008578cf77557033df322e93a1e17':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:39:10 +00:00
Deepanshu Gupta
01041ec00e am 7e0b1d59: am d056218b: am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '7e0b1d59010ad69372575e5d87dc6b6f2c9486da':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:39:09 +00:00
Deepanshu Gupta
dd46bfd095 am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '02d88f7b350e166da3b1f480c912351a5c72d00c':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:39:08 +00:00
Deepanshu Gupta
ab869de19e am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'cd192c0b1ca56af3ed3dfdb38626304de0412254':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:36:41 +00:00
Deepanshu Gupta
236b71649c am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '0ab0d875d46d6d8974c9cf3ea5856dcfb557e9a4':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:35:12 +00:00
Adam Lesinski
522c5ce280 am 7e547e0d: Merge "Add --pseudo-localize option to generate resources for pseudolocales." 
* commit '7e547e0d72817032737909952f00acc2e777a35a':
  Add --pseudo-localize option to generate resources for pseudolocales.
 2014-06-03 20:35:11 +00:00
Deepanshu Gupta
02d88f7b35 am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'ffbf24476c153bbd9293261cc14d9648f72b7369':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:35:09 +00:00
Deepanshu Gupta
7e0b1d5901 am d056218b: am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'd056218b0486676f8e3b68854f94e2d36209ea18':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:35:02 +00:00
Deepanshu Gupta
4f69d5b8e9 am 8af310c0: am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '8af310c0c6a0922d2a84600f9abf7877009d12ba':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:32:57 +00:00
Deepanshu Gupta
cd192c0b1c am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '704954c96a797e45d421b8d910ca2426d19f6b37':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:32:55 +00:00
Deepanshu Gupta
d056218b04 am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '661e158b0a754f1123485673ac050e388e8056a2':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:30:57 +00:00
Deepanshu Gupta
0ab0d875d4 am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '28f550f010045d5df9e7762a567fb0351499b846':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:30:53 +00:00
Deepanshu Gupta
ffbf24476c am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '083af20d9dc0d14eadd2ba03951579f88cd1f671':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:30:50 +00:00
Deepanshu Gupta
8af310c0c6 am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '8f6a9a658a8a06eb4f11cfff5dca7edf3c7462ad':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:29:01 +00:00
Deepanshu Gupta
704954c96a am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '5f56ea8d802b3a7ce5ba8992a84dd3b462676e0e':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:28:48 +00:00
Ricardo Cervera
a01b7003c0 docs: Added release notes for SDK Tools 22.6.4 
Change-Id: Iff4d980d0159b6773f6d6c60ed5d413d4e698083
 2014-06-03 13:27:41 -07:00
Deepanshu Gupta
661e158b0a am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '2ac96a093b12883c44327edba899e6c79ee71a7b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:27:08 +00:00
Deepanshu Gupta
28f550f010 am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '03a832669ded18a99d4ac37f047a82d2b198302a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:25:51 +00:00
Deepanshu Gupta
083af20d9d am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '531bdb5b57a7a903cea16baedb914e34df941651':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:25:48 +00:00
Deepanshu Gupta
5f56ea8d80 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'f48ab8feec71419e574a2d2f08a29be87743ef07':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:24:25 +00:00
Deepanshu Gupta
8f6a9a658a am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '8974a5e6d8408b4cd93f1befb05cc9b654b71e4a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:23:30 +00:00
Deepanshu Gupta
2ac96a093b am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'a0fc1f46264e316449402525fbeb033138ec5f49':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:20 +00:00
Deepanshu Gupta
03a832669d am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '08d2007b33838570a96c8df890f0757fa920904c':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:12 +00:00
Deepanshu Gupta
f48ab8feec am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '3b7c09b4336f421c489523c10278ecfbfb0708a7':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:10 +00:00
Deepanshu Gupta
531bdb5b57 am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'fe6f30491f8506a4b2ad895a0f3e68de180e4243':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:21:08 +00:00
Adam Lesinski
7e547e0d72 Merge "Add --pseudo-localize option to generate resources for pseudolocales." 2014-06-03 20:11:13 +00:00
Tim Murray
f0c62b2676 Add support for mixed 32/64 APKs using RenderScript. 
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
 2014-06-03 12:30:53 -07:00
Igor Viarheichyk
a191d0464f Add --pseudo-localize option to generate resources for pseudolocales. 
Update help output with new option, remove mention of obsolete zz_ZZ
pseudolocale.

Change-Id: Ie2cfc8d11ef6a57e2b9a2333514a7340a3a8c075
 2014-06-03 12:07:50 -07:00
Andrew Solovay
50cf4a6a30 am aaaa7769: am 9dc2412d: am 47ede834: docs: Fixed alphabetization on Play Store icons page. 
* commit 'aaaa7769139fd1ef683a445c76414f6dcfe07d3b':
  docs: Fixed alphabetization on Play Store icons page.
 2014-06-03 18:06:56 +00:00
Michael Kolb
a4f593d7fb am 576a0d14: Merge "Fix circular mask" into klp-modular-dev 
* commit '576a0d14e19dae9fa6aa50e0bb836a1da793ef21':
  Fix circular mask
 2014-06-03 18:06:25 +00:00
Andrew Solovay
aaaa776913 am 9dc2412d: am 47ede834: docs: Fixed alphabetization on Play Store icons page. 
* commit '9dc2412dfcaa4d5c77ea892c3c1d3d6ea59597dd':
  docs: Fixed alphabetization on Play Store icons page.
 2014-06-03 17:42:05 +00:00
Andrew Solovay
9dc2412dfc am 47ede834: docs: Fixed alphabetization on Play Store icons page. 
* commit '47ede8340b8bd4e5e5c500ddf84b3510dd12c1a0':
  docs: Fixed alphabetization on Play Store icons page.
 2014-06-03 17:38:04 +00:00
Narayan Kamath
00e3c58d02 am 73f7cd98: Merge "Fix build." 
* commit '73f7cd98d61eded2cc3af0f672937c7a2ec5c10a':
  Fix build.
 2014-06-03 14:08:51 +00:00
Narayan Kamath
73f7cd98d6 Merge "Fix build." 2014-06-03 13:56:03 +00:00
Narayan Kamath
26c6c03196 Fix build. 
Bad resolution of a manual rebase.

Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7
 2014-06-03 14:54:52 +01:00
Narayan Kamath
dd2e9d3386 am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs." 
* commit '7cb13f8a0a40f3d971a953b330f38bfcfb001c5e':
  Scan for renderscript files before deciding ABIs.
 2014-06-03 13:24:50 +00:00
Narayan Kamath
797b109c60 am 7ed98c43: Merge "Add an --abi argument to "pm install"" 
* commit '7ed98c43f8cbcfbb4862205a72455ab39359a011':
  Add an --abi argument to "pm install"
 2014-06-03 13:24:45 +00:00
Narayan Kamath
41aa48beac am 032c5c05: Merge "Log process abis during start." 
* commit '032c5c054c331b63f2d45ee9c497ac852faec633':
  Log process abis during start.
 2014-06-03 13:24:34 +00:00
Narayan Kamath
7cb13f8a0a Merge "Scan for renderscript files before deciding ABIs." 2014-06-03 12:20:05 +00:00
Narayan Kamath
d47e38b634 Scan for renderscript files before deciding ABIs. 
The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.

bug: 14900093

Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a
 2014-06-03 12:58:35 +01:00
Narayan Kamath
7ed98c43f8 Merge "Add an --abi argument to "pm install"" 2014-06-03 11:10:02 +00:00