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

2631 Commits

Author SHA1 Message Date
Marcin Kosiba
0bdcb84b55 am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev 
* commit '972628dc8c63b02b75f9e976b3ab67e3913da1a8':
  Don't use reflection when generating the onResourcesLoaded callback.
 2014-09-11 18:49:07 +00:00
Marcin Kosiba
a0a9466476 Merge "Don't use reflection when generating the onResourcesLoaded callback." into lmp-dev 2014-09-11 18:34:33 +00:00
Marcin Kosiba
0f3a5a6559 Don't use reflection when generating the onResourcesLoaded callback. 
BUG: 17466240
Change-Id: I74608f3d8b3617281639a9d387face97e15fb616
 2014-09-11 16:02:13 +01:00
Deepanshu Gupta
1cc6e8450b am 92e039ee: am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev 
* commit '92e039ee821aca56f80237c5f58a1f1756b0b3a7':
  LayoutLib: support font weights.
 2014-09-11 05:15:12 +00:00
Deepanshu Gupta
820ce63cea Merge "LayoutLib: support font weights." into lmp-dev 2014-09-11 04:54:26 +00:00
Deepanshu Gupta
145bc2d067 LayoutLib: support font weights. 
Also fixes a shader delegate method.

Change-Id: I86be80ab55d04760084d5bf39235f2ee4de7be23
 2014-09-10 17:01:16 -07:00
Dianne Hackborn
8611dde57b am 803a6f39: am 829b79f6: Merge "Fix build." into lmp-dev 
* commit '803a6f399a2e0bfac8beb5d7ac2425dd3d9bdc46':
  Fix build.
 2014-09-10 01:04:22 +00:00
Adam Lesinski
017d1bdca7 am 716c7279: am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev 
* commit '716c7279854318eeabad39b7bb187aa69ad41c97':
  AAPT: Don't crash on illegal symbol name
 2014-09-10 00:51:15 +00:00
Dianne Hackborn
d5adbec527 Merge "Fix build." into lmp-dev 2014-09-10 00:40:55 +00:00
Dianne Hackborn
f5cc3644f6 Fix build. 
Change-Id: I92eabc35168acfe58641917179be0d90a14f2f11
 2014-09-09 17:38:34 -07:00
Adam Lesinski
e7ad74f070 Merge "AAPT: Don't crash on illegal symbol name" into lmp-dev 2014-09-09 23:15:08 +00:00
Adam Lesinski
3fb8c9b50e AAPT: Don't crash on illegal symbol name 
We never checked the return value when adding a nested
symbol, which would be NULL if the symbol name was invalid.

External bug: https://code.google.com/p/android/issues/detail?id=75876

Change-Id: I5211f4d4b87897d52f2b6e5907113d31930bb92d
 2014-09-09 16:05:10 -07:00
Dan Albert
6800165351 resolved conflicts for merge of 1d99636f to lmp-dev-plus-aosp 
Change-Id: Ic5f808de7d9722056112c6a73c718892e00bc9df
 2014-09-09 09:51:01 -07:00
Dan Albert
1d99636fcc am 8085477f: Merge "Don\'t check for null references." 
* commit '8085477fb98eab36bbc8c3e9add76f398235b469':
  Don't check for null references.
 2014-09-09 16:35:02 +00:00
Dan Albert
8085477fb9 Merge "Don't check for null references." 2014-09-09 16:25:41 +00:00
Dan Albert
bb4ed4947c Merge "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-09-09 05:29:21 +00:00
Dan Albert
20ec4fa229 resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp 
Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96
 2014-09-08 22:25:54 -07:00
Deepanshu Gupta
3f82a64d44 am 7e7fbbba: am c52a1286: Merge "Build layoutlib create tests as part of sdk build." into lmp-dev 
* commit '7e7fbbbac2d9b1bcda44cc4f9d81879772c354ed':
  Build layoutlib create tests as part of sdk build.
 2014-09-09 05:21:10 +00:00
Dan Albert
ddb605d4b2 am de86cf13: am 5a6934c0: Merge "Don\'t pollute the namespace for two uses." 
* commit 'de86cf1362ef0461b589fa85bdd5c58921010c6a':
  Don't pollute the namespace for two uses.
 2014-09-09 05:19:06 +00:00
Dan Albert
6c585756b4 am 2ffa4aab: Merge "Use char16_t for char things." 
* commit '2ffa4aabd76353a907ee89a3e0c6f1961237f257':
  Use char16_t for char things.
 2014-09-09 04:37:42 +00:00
Dan Albert
2ffa4aabd7 Merge "Use char16_t for char things." 2014-09-09 04:30:35 +00:00
Dan Albert
de86cf1362 am 5a6934c0: Merge "Don\'t pollute the namespace for two uses." 
* commit '5a6934c07946743e622df52ba1155d97129b37f0':
  Don't pollute the namespace for two uses.
 2014-09-09 04:23:57 +00:00
Dan Albert
1c6c7573e9 Don't pollute the namespace for two uses. 
Clang complains about ambiguity between std::hash and ::hash (locally
defined). There's no need to pull in the whole namespace for two uses of
std::map anyway.

Change-Id: Icbaa7ebbaad05999988784ad34662c721fb12b29
 2014-09-08 18:44:12 -07:00
Deepanshu Gupta
8f92d92a09 Build layoutlib create tests as part of sdk build. 
LayoutLib Create tests are now built whenever LayoutLib create is built.

Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
 2014-09-08 18:38:57 -07:00
Dan Albert
a8995adc2b Don't check for null references. 
The address of a reference will never be null in well formed C++ code.
The function returning the value being checked simply returns a
dereferenced pointer (which is just going to segfault if it is null!).

Change-Id: I3a4eb6adfc003c63ebf21b81d46088d52154d99d
 2014-09-08 18:34:29 -07:00
Dan Albert
f348c15ecf Use char16_t for char things. 
When compiling in C++ mode, the compiler will complain about conversions
from uint16_t to char16_t. Be consistent in using char16_t for strings.

Change-Id: I052b6176ced635162920b31560052d9a64f92764
 2014-09-08 18:30:08 -07:00
Deepanshu Gupta
968051af09 am 06e6b622: am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev 
* commit '06e6b622b9f9c6501f4888704bb15154d7c0a703':
  Update IntelliJ project file for IntelliJ 14
 2014-09-09 00:47:41 +00:00
Deepanshu Gupta
6c39b72f57 am ac00fca2: am 45997e76: Merge "Add layoutlib tests to DIST_DIR" into lmp-dev 
* commit 'ac00fca287036b8496815c5da81222c5d34090f2':
  Add layoutlib tests to DIST_DIR
 2014-09-09 00:47:36 +00:00
Deepanshu Gupta
9668f59a0c am 5728a78a: am f86fe4a8: Merge "Remove warning for null entries in resource array." into lmp-dev 
* commit '5728a78a4f618821bad926ffc340b0d2c3452e27':
  Remove warning for null entries in resource array.
 2014-09-09 00:47:31 +00:00
Deepanshu Gupta
8d29a06ad7 Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev 2014-09-09 00:31:03 +00:00
Deepanshu Gupta
93b828de58 Merge "Add layoutlib tests to DIST_DIR" into lmp-dev 2014-09-09 00:30:24 +00:00
Deepanshu Gupta
fa4e214814 Merge "Remove warning for null entries in resource array." into lmp-dev 2014-09-09 00:30:08 +00:00
Deepanshu Gupta
8c766fea93 Update IntelliJ project file for IntelliJ 14 
IntelliJ keeps reordering the options this way each time the project is
opened.

Change-Id: I0e19b5b0a858b3fa9a1134b883ed5180c4ef146e
 2014-09-08 14:49:49 -07:00
Winson Chung
2e29a6dc03 am 3004eee6: am 04682c2f: Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565) 
* commit '3004eee618c3fad547768210f9252bad5abb0f69':
  Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565)
 2014-09-07 20:25:59 +00:00
Winson Chung
2e7f3bdcc9 Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565) 
Change-Id: Ic104876c5fe16997eca00e0a2b3d8644c927120c
 2014-09-07 20:08:40 +00:00
Deepanshu Gupta
a0904bf7aa Add layoutlib tests to DIST_DIR 
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
 2014-09-05 14:01:27 -07:00
Jeff Sharkey
fd9e0e8d25 am 51c82f1b: am 04324ae4: Merge changes I10ab0b4a,Id32dcbd5 into lmp-dev 
* commit '51c82f1be958e80e2f32c13312f28663fc0d49d5':
  Catch incompatible API regressions.
  Add blame to API lint, some exemptions.
 2014-09-04 23:04:31 +00:00
Jeff Sharkey
8b9c97a4e2 Merge changes I10ab0b4a,Id32dcbd5 into lmp-dev 
* changes:
  Catch incompatible API regressions.
  Add blame to API lint, some exemptions.
 2014-09-04 22:49:22 +00:00
Jeff Sharkey
037458a5ba Catch incompatible API regressions. 
Ignore deprecation, synchronized, and throws definitions.  Look
through full inheritance hierarchy to catch refactored classes like
BaseBundle.

Change-Id: I10ab0b4a0ef64e7508f38d0c223f08711293d643
 2014-09-04 15:46:23 -07:00
Deepanshu Gupta
cd0bb17d30 Remove warning for null entries in resource array. 
Change-Id: I32e0b8129e29f3e1e5a472b26e16f3fd06d4b91b
 2014-09-04 12:54:26 -07:00
Jeff Sharkey
1498f9c615 Add blame to API lint, some exemptions. 
Now offers to parse the output of git blame, and includes the last
person to modify that API for each reported failure.

Add more exemptions, and check for boolean setFoo() method inside a
separate Builder inner class.

Change-Id: Id32dcbd5edf17d2360e4f782110bc1c445f7936e
 2014-09-04 12:45:36 -07:00
Deepanshu Gupta
4ac648e03c am b16739ef: am c9d0cb09: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev 
* commit 'b16739efd81f1540ed36cd0f736b8f6d75a77ead':
  Remove ANDROID_BUILD_TOP from intelliJ path variables.
 2014-09-04 03:23:54 +00:00
Deepanshu Gupta
655ab01b3d am 332b35fd: am 80899170: Merge "enums in dimension attributes." into lmp-dev 
* commit '332b35fdc651dc61bc03fda47e0a98252cf66159':
  enums in dimension attributes.
 2014-09-04 03:23:29 +00:00
Deepanshu Gupta
1efd27c310 am 0b95c63a: am 7d931c01: Merge "Null out "@null" attributes." into lmp-dev 
* commit '0b95c63a00031dd12e4f4d40239f01eba32793ed':
  Null out "@null" attributes.
 2014-09-04 03:23:23 +00:00
Deepanshu Gupta
e7b6efdd4a am 6bb49454: am 8fbaefb0: Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-dev 
* commit '6bb494548f5ea3daaded54659eebb0bdaca801e6':
  LayoutLib: Fix warnings in ResourceHelper.
 2014-09-04 03:23:18 +00:00
Deepanshu Gupta
3ff936f333 am b553e8a5: am 02c6c26d: Merge "LayoutLib: Allow \'+\' in float attributes." into lmp-dev 
* commit 'b553e8a520d4cda5762b777aee29f80e26f293ed':
  LayoutLib: Allow '+' in float attributes.
 2014-09-04 03:23:12 +00:00
Deepanshu Gupta
f0bf13cb45 am 8af5cd51: am 229833c3: Merge "Fix invalid conditional check." into lmp-dev 
* commit '8af5cd512a7d71834e8d31b8b7d6240abe334699':
  Fix invalid conditional check.
 2014-09-04 03:23:07 +00:00
Deepanshu Gupta
c1b93e47e9 am 3aa86336: am 2d5629df: Merge "Build layoutlib_create tests." into lmp-dev 
* commit '3aa86336981b0b6b443b3235f46d3f1104f2849b':
  Build layoutlib_create tests.
 2014-09-04 03:23:01 +00:00
Deepanshu Gupta
708df7bc45 Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev 2014-09-04 01:51:55 +00:00
Deepanshu Gupta
db0b8a1997 Merge "enums in dimension attributes." into lmp-dev 2014-09-04 01:48:24 +00:00