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

2779 Commits

Author SHA1 Message Date
Jerome Dochez
7caeb08619 am b51644c3: am e36550dc: am 0757e5fd: am c9c512e0: am f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev 
* commit 'b51644c3c7d428d92202c2c6a8f6ba69700a71f1':
  Added a daemon mode to aapt to receive streams of commands from gradle.
 2014-10-10 23:29:08 +00:00
Jerome Dochez
b51644c3c7 am e36550dc: am 0757e5fd: am c9c512e0: am f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev 
* commit 'e36550dc9e202450d0921bf65d00d14e7e3e8a54':
  Added a daemon mode to aapt to receive streams of commands from gradle.
 2014-10-10 23:21:01 +00:00
Jerome Dochez
0757e5fd6d am c9c512e0: am f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev 
* commit 'c9c512e0ff2faf86eb544bf175a1d177f9b7ba6d':
  Added a daemon mode to aapt to receive streams of commands from gradle.
 2014-10-10 22:53:16 +00:00
Jerome Dochez
f47f885517 Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev 2014-10-10 19:21:49 +00:00
Deepanshu Gupta
6799cdea94 am 7c5020db: am d8497e45: am 0a61c7ee: am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit '7c5020db4f5fc8f72179d6e34b9189e70f14eb5c':
  Exclude KXmlParser from LayoutLib.
 2014-10-10 05:41:13 +00:00
Deepanshu Gupta
7c5020db4f am d8497e45: am 0a61c7ee: am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit 'd8497e45c72fbb27961d096499984906af19d35f':
  Exclude KXmlParser from LayoutLib.
 2014-10-10 04:26:33 +00:00
Elliott Hughes
0f371857b0 am 90e01b3b: am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structure." 
* commit '90e01b3b401a038796a2e2e3a8611bb3b706d82c':
  Track change to private libcore data structure.
 2014-10-09 18:26:20 +00:00
Elliott Hughes
b913af5408 Track change to private libcore data structure. 
Bug: 15476051

(cherry picked from commit d47acaeecd991ecd01ecc9a37e60011f545712d7)

Change-Id: Iac79ce3602282a2780dd895995f42ab03f346ad4
 2014-10-09 11:20:56 -07:00
Elliott Hughes
90e01b3b40 am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structure." 
* commit 'b68fe9e5f355a3d13ed74cb89fb3e3818b356cee':
  Track change to private libcore data structure.
 2014-10-09 18:20:23 +00:00
Elliott Hughes
b68fe9e5f3 am ae1b6805: Merge "Track change to private libcore data structure." 
* commit 'ae1b6805a2609759186af8d7131c4750e011019a':
  Track change to private libcore data structure.
 2014-10-09 18:13:54 +00:00
Elliott Hughes
d47acaeecd Track change to private libcore data structure. 
Bug: 15476051
Change-Id: I4e28ecfa3a1d03c21f9bbde7f3daf79a79d96fe6
 2014-10-08 16:07:33 -07:00
Deepanshu Gupta
908a4f9a43 am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit '4f133894a6e98d8d30557ea42cec92cfb21fa5c9':
  Exclude KXmlParser from LayoutLib.
 2014-10-08 17:34:12 +00:00
Deepanshu Gupta
4f133894a6 Exclude KXmlParser from LayoutLib. 
The class was incorrectly being included in the LayoutLib.

Change-Id: I3c86662efa068019fe9165f2fc49a00d0a1b7f2d
 2014-10-08 10:12:11 -07:00
Deepanshu Gupta
11b14e3996 LayoutLib: Use ICU's line break algo. [DO NOT MERGE] 
Change-Id: I7e5b0ab7423a72f5a4b0e1163d0a537f0b03ba07
(cherry picked from commit 760f6394d0f65fbb5365186e8e068d53c506b653)
 2014-10-08 02:05:05 +00:00
Adam Lesinski
f48a4d151e am 5787920f: am 85035d90: am b2b166a5: am 397001b2: am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev 
* commit '5787920f5bbac1c7cf296b5c042daf0108dbdacc':
  AAPT: Gate v21 resource synthesizing logging behind -v flag
 2014-10-04 00:42:36 +00:00
Adam Lesinski
5787920f5b am 85035d90: am b2b166a5: am 397001b2: am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev 
* commit '85035d90257beedd54641385674ce2dfb29ae241':
  AAPT: Gate v21 resource synthesizing logging behind -v flag
 2014-10-04 00:01:21 +00:00
Adam Lesinski
a80aba7072 Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev 2014-10-03 22:06:03 +00:00
Deepanshu Gupta
b51f59c9c7 am fe54f8a4: am 09714a76: am 82e28181: am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit 'fe54f8a4962d1b6366f98c24155432a9a45fd6b8':
  Minor style changes.
 2014-10-03 21:59:46 +00:00
Adam Lesinski
f15de2e215 AAPT: Gate v21 resource synthesizing logging behind -v flag 
This is verbose information and should be hidden behind the -v flag.

Bug:17822471
Change-Id: I36e2c6beb54669a31cde73416427477a80ded8a6
 2014-10-03 14:57:28 -07:00
Deepanshu Gupta
fe54f8a496 am 09714a76: am 82e28181: am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit '09714a76a9463f5e18ea8ac91ba040f6fd2235fd':
  Minor style changes.
 2014-10-03 21:52:46 +00:00
Deepanshu Gupta
c74a2b3435 Merge "Minor style changes." into lmp-dev 2014-10-03 20:30:45 +00:00
Jerome Dochez
6f1280cf17 Added a daemon mode to aapt to receive streams of commands from gradle. 
When crunching png, we used to spawn a separate aapt process from java
which is slow and resource intensive.
Introduced a daemon mode to appt which when invoked with -m parameter
will listen from commands on stdin and give report of command execution
on stdout.

One one command is supported so far :
s f1 f2

This command perform a single png crunch, f1 pointing to the input
png file to crunch, and f2 pointing to the path for the resulting
crunced file.

Expected output from the command is "Done" or "Error".

Change-Id: Iaf1d865e8d5ee5d36abe39dea6443715865a98d3
 2014-10-02 15:43:55 -07:00
Deepanshu Gupta
3c8140ab4b Minor style changes. 
Addressing code review comments on previous change: 171804201dd

Change-Id: I2c9e0ce35e755c23d8292749828d15a87109d6dc
 2014-10-02 11:45:07 -07:00
Deepanshu Gupta
89cccbcd3d am e4ef95bf: am 2e67a882: am 92c40bbd: am 8989290b: am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev 
* commit 'e4ef95bfe0e2c328cf20ecddb2bf168613223185':
  Always resolve enum when resolving resources.
 2014-10-02 13:46:54 +00:00
Neil Fuller
ebf2e8b451 am c2a0b448: resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
* commit 'c2a0b4482d7144e8382346ea4c22c7b89368fec0':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 13:39:55 +00:00
Deepanshu Gupta
e4ef95bfe0 am 2e67a882: am 92c40bbd: am 8989290b: am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev 
* commit '2e67a88214fa93a325a84a4b8e6ae122544c8edb':
  Always resolve enum when resolving resources.
 2014-10-02 13:38:54 +00:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
Stephen Hines
d27edcaa19 am f08384c7: am 25a8e43b: am 7d92ae6d: am 5b3be618: am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev 
* commit 'f08384c763d2e57c05e0be4325c267d12fc516d4':
  include direct.h for _mkdir
 2014-10-02 12:53:27 +00:00
Stephen Hines
f08384c763 am 25a8e43b: am 7d92ae6d: am 5b3be618: am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev 
* commit '25a8e43b13e719ff97edd174f8b1ed175e6f91b0':
  include direct.h for _mkdir
 2014-10-02 12:41:58 +00:00
Andreas Gampe
5a76866317 am 5e77475b: am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '5e77475b5d1de1fecbaf5b3e27988a255a3c399e':
  Frameworks/base: Fix more aapt issues
 2014-10-02 12:38:28 +00:00
Andreas Gampe
5e77475b5d am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '152d9aae631381ea28f5701168d372a1486a7502':
  Frameworks/base: Fix more aapt issues
 2014-10-02 12:31:16 +00:00
Neil Fuller
ee665151a4 am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible" 
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 10:18:29 +00:00
Neil Fuller
0c1faf43ae Merge "Switch from FloatMath -> Math and Math.hypot where possible" 2014-10-02 10:14:19 +00:00
Andreas Gampe
152d9aae63 am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '316296511bf12c4e14dfb6f54731d1a515114abf':
  Frameworks/base: Fix more aapt issues
 2014-10-02 07:01:55 +00:00
Andreas Gampe
054262cbca am 87332a71: resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp 
* commit '87332a7109610d02ac7f5db6af99d3a11813d5c1':
  Frameworks/base: Fix AAPT warnings
 2014-10-02 06:33:22 +00:00
Andreas Gampe
87332a7109 resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp 
Change-Id: I8f7cbd971beae3ab134195e612d705860665142f
 2014-10-01 23:26:06 -07:00
Andreas Gampe
b8dc7bc582 Frameworks/base: Fix more aapt issues 
Change-Id: I6da7dc674e9f9e3b0886a3cfd1e3194d6b5ac948
 2014-10-01 20:42:00 -07:00
Deepanshu Gupta
7b13c4d8ec Merge "Always resolve enum when resolving resources." into lmp-dev 2014-10-02 03:27:42 +00:00
Andreas Gampe
1dcc75b2db am 0ce259c2: Merge "Frameworks/base: Fix AAPT warnings" 
* commit '0ce259c2f69cefd09342a95fbbd4c1a63a0af484':
  Frameworks/base: Fix AAPT warnings
 2014-10-01 23:38:25 +00:00
Andreas Gampe
2412f84064 Frameworks/base: Fix AAPT warnings 
Turn on -Wall -Werror. Fix warnings.

Change-Id: I287fb3c1e851c654479bcf9ea8c73bd354a6b2a1
 2014-10-01 16:18:06 -07:00
Dan Albert
6f5b091d09 am 47c23a22: resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp 
* commit '47c23a228deb2fa2e7158c58fc42441e8517ea38':
  Use std::sort instead of qsort_r wrapper.
 2014-10-01 20:58:10 +00:00
Dan Albert
47c23a228d resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp 
Change-Id: Id09c2786db18fa7e747cd1652ea95f575c3f5c46
 2014-10-01 13:52:49 -07:00
Dan Albert
fe50cfd533 am c46dbe8a: Merge "Use std::sort instead of qsort_r wrapper." 
* commit 'c46dbe8ac4748a0084b026524ad9e5ac44fb9fde':
  Use std::sort instead of qsort_r wrapper.
 2014-10-01 20:34:15 +00:00
Deepanshu Gupta
409bd3d774 Resource resolution bug fix. [DO NOT MERGE] 
Fix a bug where "?attr/foo" in framework resources wasn't resolved
properly.

Change-Id: I9a56974f526774fde79685f668f01021136d68f1
(cherry picked from commit 19c7842082d831ad432abe906f4c37c6ed08e414)
 2014-10-01 12:45:26 -07:00
Deepanshu Gupta
fea51feb5c Fix Tests after cherry picks. [DO NOT MERGE] 
1. Updated the intelliJ run configuration for the layoutlib_create tool.
2. Updated the code to search for the platform.dir.
3. Update tests to use AppTheme and Target SDK 19

Change-Id: I6f1cc6ff2a53e4474c746537029c7f89c6dd6dc1
(cherry picked from commit 8592eeafd01370d1a17e34602290becf7f611c75)
 2014-10-01 12:44:24 -07:00
Deepanshu Gupta
98a03e771e Update intelliJ copyright profile [DO NOT MERGE] 
Change-Id: Ib9386b686cb24e1f187d0b636b59b4b13d59bbcd
(cherry picked from commit 91fa62ac67a5e294124b5bfb70b35addc7687c34)
 2014-10-01 12:44:14 -07:00
Deepanshu Gupta
039d5849ea Build layoutlib create tests as part of sdk build. [DO NOT MERGE] 
LayoutLib Create tests are now built whenever LayoutLib create is built.

Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
(cherry picked from commit 4efe6264f1251fa200427f54ea6f5dd4c4d03665)
 2014-10-01 12:44:05 -07:00
Deepanshu Gupta
6fb5fdc233 Add layoutlib tests to DIST_DIR [DO NOT MERGE] 
Add the layoutlib and layoutlib-create tests to DIST_DIR for sdk
targets. These can be used for continuous testing on the build server.

Change-Id: I747dddcddfd8009937668bec4d75cb99bf63235f
(cherry picked from commit f9c749c9901c459f77ffc6f4fbbc15f4142c6e0a)
 2014-10-01 12:43:52 -07:00
Deepanshu Gupta
bd4133133a Build layoutlib_create tests. [DO NOT MERGE] 
Change-Id: Ia13a090f8ec29b2b2a107825b6a13d7db77e6d61
(cherry picked from commit 2294f939bc79ce902a40db37def64cc28394d56b)
 2014-10-01 12:43:43 -07:00
Deepanshu Gupta
3f0e467a06 Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE] 
The variable is not actually needed and it makes working with different
API levels a lot easier since everything now depends on $PROJECT_DIR$.

This change also makes the tests more robust by improving the way it
tries to find the SDK.

Change-Id: I3502ad4a0ba85fd88b497e47964fddb2a89e520c
(cherry picked from commit 5377695d4ecf3cc6dc1abe59bbfca63f6137b722)
 2014-10-01 12:43:32 -07:00