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

2866 Commits

Author SHA1 Message Date
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
a780eee462 Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev 2014-09-04 01:53:38 +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
Deepanshu Gupta
351ed32961 Merge "Null out "@null" attributes." into lmp-dev 2014-09-04 01:48:14 +00:00
Deepanshu Gupta
bcbe8fcdb1 Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-dev 2014-09-04 01:46:58 +00:00
Deepanshu Gupta
a7c2419ec9 Merge "LayoutLib: Allow '+' in float attributes." into lmp-dev 2014-09-04 01:46:42 +00:00
Deepanshu Gupta
d75edc41a6 Merge "Fix invalid conditional check." into lmp-dev 2014-09-04 01:46:14 +00:00
Deepanshu Gupta
8a2ff1ecd9 Merge "Build layoutlib_create tests." into lmp-dev 2014-09-04 01:45:36 +00:00
Deepanshu Gupta
b988c8fa66 Build layoutlib_create tests. 
Change-Id: Ia13a090f8ec29b2b2a107825b6a13d7db77e6d61
 2014-09-03 12:57:12 -07:00
Deepanshu Gupta
1a12b80569 LayoutLib: Fix warnings in ResourceHelper. 
Fix intelliJ warnings in ResourceHelper. Most of them just change
boolean checks "x == false" with "!x".

Change-Id: I278645e2807affd8b3183a4a6f5e4fa2ab7b3d21
 2014-09-03 11:59:33 -07:00
Deepanshu Gupta
458f2a7bbb LayoutLib: Allow '+' in float attributes. 
Earlier change to fix the invalid conditional check inadvertedly
disallowed '+'.

Change-Id: I75a37926681fe3a496482d6fb75161ac75326109
 2014-09-03 11:59:22 -07:00
Jeff Sharkey
4821cc7449 am c232d730: am 1722913f: Merge "More API lint checks." into lmp-dev 
* commit 'c232d730ca1a6d1ede9cc79c8f81c77dae999a3c':
  More API lint checks.
 2014-08-30 02:59:55 +00:00
Jeff Sharkey
294f0de15b More API lint checks. 
When offering a helper Service, etc, all platform provided methods
should be marked final.  Otherwise, if available for developer to
override, they should follow onFoo() style naming.

Catch anyone returning concrete collections types, and look for
overlapping flags.

Change-Id: I29d95f3dff78a4da968a46f10be89eada509648c
 2014-08-29 17:41:49 -07:00
Adam Lesinski
05f2119432 am 135fba7e: am c169c888: Change platformBuildVersionCode to name in aapt dump badging 
* commit '135fba7ecdf4bb697b004329c6070a2ef544d8e3':
  Change platformBuildVersionCode to name in aapt dump badging
 2014-08-29 19:07:34 +00:00
Adam Lesinski
343cabb316 am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev 
* commit '60f193fbe905f65750503cdaf8616d31c85016d6':
  Stamp platform version code into app Apks
 2014-08-29 18:48:33 +00:00
Adam Lesinski
5283faba4a Change platformBuildVersionCode to name in aapt dump badging 
Change-Id: Ie3972105b3f6a727682f91851f7a99b05bb28e1a
 2014-08-29 11:27:00 -07:00
Jeff Sharkey
2db944fa30 am f9dfbbf3: am f894a0d3: Merge "Teach API lint about package layering!" into lmp-dev 
* commit 'f9dfbbf3c0e2f12a8c712704e43f3dff66beb151':
  Teach API lint about package layering!
 2014-08-29 03:58:15 +00:00
Adam Lesinski
b32063822b Merge "Stamp platform version code into app Apks" into lmp-dev 2014-08-29 01:54:15 +00:00
Jeff Sharkey
932a07cefe Teach API lint about package layering! 
Now it can identify layering violations, like when something deep in
android.os depends on android.app.

Change-Id: I94606c642195b3ed7558ff6979ed4a181cd85fa2
 2014-08-28 16:16:07 -07:00
Jeff Sharkey
894ca05b21 am 2cf50caa: am babbcbb1: Merge "Lint tool for current.txt." into lmp-dev 
* commit '2cf50caa54168041f02c8283dfb344463a9edb18':
  Lint tool for current.txt.
 2014-08-28 22:57:41 +00:00