summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power ↵John Spurlock2014-09-141-0/+5
|\ | | | | | | | | | | | | mode." into lmp-dev * commit '1c1683a35a0267c03729fa36b930c3dc803aff7a': Saver: PowerManager call to set low power mode.
| * Saver: PowerManager call to set low power mode.John Spurlock2014-09-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add an explicit power manager call to set the low power mode state, instead of trying manage everything around a single setting. - When low-power mode is triggered by falling below the configured threshold, it does not update the setting. - The "is-enabled" api returns setting || below configured trigger. - Move the snooze management into the new api call. - Callers (sysui + settings) updated to use the api instead of the setting. - Handles the case where the level does an unpowered leap out of the low battery level. (Possible if powered in-between while the device is off) Bug:17460535 Change-Id: Ic030504c9cad9868a7137abbe837b170da37852b
* | am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the ↵Marcin Kosiba2014-09-112-104/+73
|\ \ | |/ | | | | | | | | | | onResourcesLoaded callback." into lmp-dev * commit '972628dc8c63b02b75f9e976b3ab67e3913da1a8': Don't use reflection when generating the onResourcesLoaded callback.
| * Merge "Don't use reflection when generating the onResourcesLoaded callback." ↵Marcin Kosiba2014-09-112-104/+73
| |\ | | | | | | | | | into lmp-dev
| | * Don't use reflection when generating the onResourcesLoaded callback.Marcin Kosiba2014-09-112-104/+73
| | | | | | | | | | | | | | | BUG: 17466240 Change-Id: I74608f3d8b3617281639a9d387face97e15fb616
* | | am 92e039ee: am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-devDeepanshu Gupta2014-09-113-60/+166
|\ \ \ | |/ / | | | | | | | | | * commit '92e039ee821aca56f80237c5f58a1f1756b0b3a7': LayoutLib: support font weights.
| * | Merge "LayoutLib: support font weights." into lmp-devDeepanshu Gupta2014-09-113-60/+166
| |\ \
| | * | LayoutLib: support font weights.Deepanshu Gupta2014-09-103-60/+166
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes a shader delegate method. Change-Id: I86be80ab55d04760084d5bf39235f2ee4de7be23
* | | | am 803a6f39: am 829b79f6: Merge "Fix build." into lmp-devDianne Hackborn2014-09-101-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '803a6f399a2e0bfac8beb5d7ac2425dd3d9bdc46': Fix build.
| * | | Merge "Fix build." into lmp-devDianne Hackborn2014-09-101-0/+5
| |\ \ \
| | * | | Fix build.Dianne Hackborn2014-09-091-0/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I92eabc35168acfe58641917179be0d90a14f2f11
* | | | | am 716c7279: am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" ↵Adam Lesinski2014-09-101-2/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '716c7279854318eeabad39b7bb187aa69ad41c97': AAPT: Don't crash on illegal symbol name
| * | | | Merge "AAPT: Don't crash on illegal symbol name" into lmp-devAdam Lesinski2014-09-091-2/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | AAPT: Don't crash on illegal symbol nameAdam Lesinski2014-09-091-2/+6
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | resolved conflicts for merge of 1d99636f to lmp-dev-plus-aospDan Albert2014-09-091-10/+3
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Ic5f808de7d9722056112c6a73c718892e00bc9df
| * \ \ \ am 8085477f: Merge "Don\'t check for null references."Dan Albert2014-09-091-11/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '8085477fb98eab36bbc8c3e9add76f398235b469': Don't check for null references.
| | * \ \ \ Merge "Don't check for null references."Dan Albert2014-09-091-11/+2
| | |\ \ \ \
| | | * | | | Don't check for null references.Dan Albert2014-09-081-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp" into ↵Dan Albert2014-09-095-22/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev-plus-aosp
| * \ \ \ \ \ \ resolved conflicts for merge of 6c585756 to lmp-dev-plus-aospDan Albert2014-09-085-22/+22
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96
| | * | | | | | am 2ffa4aab: Merge "Use char16_t for char things."Dan Albert2014-09-096-25/+25
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ffa4aabd76353a907ee89a3e0c6f1961237f257': Use char16_t for char things.
| | | * | | | | Merge "Use char16_t for char things."Dan Albert2014-09-096-25/+25
| | | |\ \ \ \ \
| | | | * | | | | Use char16_t for char things.Dan Albert2014-09-086-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | am 7e7fbbba: am c52a1286: Merge "Build layoutlib create tests as part of sdk ↵Deepanshu Gupta2014-09-091-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | build." into lmp-dev * commit '7e7fbbbac2d9b1bcda44cc4f9d81879772c354ed': Build layoutlib create tests as part of sdk build.
| * | | | | | | Build layoutlib create tests as part of sdk build.Deepanshu Gupta2014-09-081-0/+3
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutLib Create tests are now built whenever LayoutLib create is built. Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
* | | | | | | am de86cf13: am 5a6934c0: Merge "Don\'t pollute the namespace for two uses."Dan Albert2014-09-091-3/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'de86cf1362ef0461b589fa85bdd5c58921010c6a': Don't pollute the namespace for two uses.
| * | | | | | am 5a6934c0: Merge "Don\'t pollute the namespace for two uses."Dan Albert2014-09-091-3/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '5a6934c07946743e622df52ba1155d97129b37f0': Don't pollute the namespace for two uses.
| | * | | | | Don't pollute the namespace for two uses.Dan Albert2014-09-081-3/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | am 7c8318c0: Merge "PackageInfo is a class, not a struct"Brian Carlstrom2014-08-171-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '7c8318c0e85540739afba3e8c0f922176bc299cd': PackageInfo is a class, not a struct
| | * | | | PackageInfo is a class, not a structBrian Carlstrom2014-08-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 646d1b8ea801d92b04ead6cbae2899d8256ec3ff) Change-Id: Id9ddc520fbfc4787c3b267df9a35a45e8cc52d65
* | | | | | am 06e6b622: am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ ↵Deepanshu Gupta2014-09-091-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 14" into lmp-dev * commit '06e6b622b9f9c6501f4888704bb15154d7c0a703': Update IntelliJ project file for IntelliJ 14
| * | | | | Merge "Update IntelliJ project file for IntelliJ 14" into lmp-devDeepanshu Gupta2014-09-091-1/+1
| |\ \ \ \ \
| | * | | | | Update IntelliJ project file for IntelliJ 14Deepanshu Gupta2014-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IntelliJ keeps reordering the options this way each time the project is opened. Change-Id: I0e19b5b0a858b3fa9a1134b883ed5180c4ef146e
* | | | | | | am ac00fca2: am 45997e76: Merge "Add layoutlib tests to DIST_DIR" into lmp-devDeepanshu Gupta2014-09-092-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ac00fca287036b8496815c5da81222c5d34090f2': Add layoutlib tests to DIST_DIR
| * | | | | | Merge "Add layoutlib tests to DIST_DIR" into lmp-devDeepanshu Gupta2014-09-092-0/+6
| |\ \ \ \ \ \
| | * | | | | | Add layoutlib tests to DIST_DIRDeepanshu Gupta2014-09-052-0/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am 5728a78a: am f86fe4a8: Merge "Remove warning for null entries in resource ↵Deepanshu Gupta2014-09-091-5/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | array." into lmp-dev * commit '5728a78a4f618821bad926ffc340b0d2c3452e27': Remove warning for null entries in resource array.
| * | | | | | Merge "Remove warning for null entries in resource array." into lmp-devDeepanshu Gupta2014-09-091-5/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Remove warning for null entries in resource array.Deepanshu Gupta2014-09-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32e0b8129e29f3e1e5a472b26e16f3fd06d4b91b
* | | | | | | am 3004eee6: am 04682c2f: Removing unnecessary delays, ensuring transition ↵Winson Chung2014-09-071-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | | | Removing unnecessary delays, ensuring transition thumbnail is the size of ↵Winson Chung2014-09-071-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | the header. (Bug. 16987565) Change-Id: Ic104876c5fe16997eca00e0a2b3d8644c927120c
* | | | | | am 51c82f1b: am 04324ae4: Merge changes I10ab0b4a,Id32dcbd5 into lmp-devJeff Sharkey2014-09-041-81/+272
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '51c82f1be958e80e2f32c13312f28663fc0d49d5': Catch incompatible API regressions. Add blame to API lint, some exemptions.
| * | | | | Merge changes I10ab0b4a,Id32dcbd5 into lmp-devJeff Sharkey2014-09-041-81/+272
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * changes: Catch incompatible API regressions. Add blame to API lint, some exemptions.
| | * | | | Catch incompatible API regressions.Jeff Sharkey2014-09-041-6/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore deprecation, synchronized, and throws definitions. Look through full inheritance hierarchy to catch refactored classes like BaseBundle. Change-Id: I10ab0b4a0ef64e7508f38d0c223f08711293d643
| | * | | | Add blame to API lint, some exemptions.Jeff Sharkey2014-09-041-77/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am b16739ef: am c9d0cb09: Merge "Remove ANDROID_BUILD_TOP from intelliJ path ↵Deepanshu Gupta2014-09-0413-23/+75
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables." into lmp-dev * commit 'b16739efd81f1540ed36cd0f736b8f6d75a77ead': Remove ANDROID_BUILD_TOP from intelliJ path variables.
| * | | | | Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-devDeepanshu Gupta2014-09-0413-23/+75
| |\ \ \ \ \
| | * | | | | Remove ANDROID_BUILD_TOP from intelliJ path variables.Deepanshu Gupta2014-08-2513-23/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am 332b35fd: am 80899170: Merge "enums in dimension attributes." into lmp-devDeepanshu Gupta2014-09-041-13/+18
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '332b35fdc651dc61bc03fda47e0a98252cf66159': enums in dimension attributes.
| * | | | | | Merge "enums in dimension attributes." into lmp-devDeepanshu Gupta2014-09-041-13/+18
| |\ \ \ \ \ \